rev 3246 - trunk/packages/koffice/debian/patches
Isaac Clerencia
isaac at costa.debian.org
Sat Mar 4 20:11:03 UTC 2006
Author: isaac
Date: 2006-03-04 20:10:30 +0000 (Sat, 04 Mar 2006)
New Revision: 3246
Modified:
trunk/packages/koffice/debian/patches/98_buildprep.diff
Log:
Update buildprep
Modified: trunk/packages/koffice/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/koffice/debian/patches/98_buildprep.diff 2006-03-04 19:53:41 UTC (rev 3245)
+++ trunk/packages/koffice/debian/patches/98_buildprep.diff 2006-03-04 20:10:30 UTC (rev 3246)
@@ -1,59 +1,5 @@
#DPATCHLEVEL=0
# vi: ft=diff
---- Makefile.in
-+++ Makefile.in
-@@ -267,6 +267,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@
-@@ -560,7 +563,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -602,12 +605,12 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- cd $(srcdir) && rm -f configure
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
- config.h: stamp-h1
-@@ -619,7 +622,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in: $(am__configure_deps)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-@@ -1115,7 +1118,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=koffice.lsm Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in Makefile.am acinclude.m4 changes-1.5 Makefile.am.in
-+KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in configure Makefile.am acinclude.m4 changes-1.5 Makefile.am.in
-
- #>+ 2
- docs-am:
--- acinclude.m4
+++ acinclude.m4
@@ -1689,15 +1689,6 @@
@@ -82,7 +28,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5935,30 +5923,15 @@
+@@ -5970,30 +5958,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -114,11 +60,11 @@
+## modifications, as long as this notice is preserved.
-# serial 47 AC_PROG_LIBTOOL
-+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
++# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6018,7 +5991,7 @@
+@@ -6053,7 +6026,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -127,7 +73,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6068,7 +6041,7 @@
+@@ -6103,7 +6076,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -136,7 +82,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6088,7 +6061,7 @@
+@@ -6123,7 +6096,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -145,7 +91,26 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6136,6 +6109,8 @@
+@@ -6143,6 +6116,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -6162,15 +6136,17 @@
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -154,7 +119,15 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6181,6 +6156,48 @@
+@@ -6211,11 +6187,56 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
])# _LT_AC_SYS_COMPILER
@@ -181,7 +154,7 @@
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
@@ -194,7 +167,7 @@
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
@@ -203,7 +176,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6253,15 +6270,15 @@
+@@ -6288,15 +6309,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -222,7 +195,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6430,14 +6447,13 @@
+@@ -6465,14 +6486,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -239,7 +212,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6449,7 +6465,6 @@
+@@ -6484,7 +6504,6 @@
esac
;;
*64-bit*)
@@ -247,7 +220,30 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6514,7 +6529,7 @@
+@@ -6518,6 +6537,22 @@
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
++sparc*-*solaris*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.o` in
++ *64-bit*)
++ case $lt_cv_prog_gnu_ld in
++ yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ *) LD="${LD-ld} -64" ;;
++ esac
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -6549,7 +6584,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -256,20 +252,20 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6524,8 +6539,10 @@
+@@ -6559,8 +6594,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
fi
fi
-@@ -6551,11 +6568,16 @@
+@@ -6586,11 +6623,16 @@
LDFLAGS="$LDFLAGS $3"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -279,15 +275,15 @@
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
else
$2=yes
fi
-@@ -6579,7 +6601,7 @@
+@@ -6614,7 +6656,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -296,7 +292,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6608,20 +6630,53 @@
+@@ -6643,20 +6685,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -320,6 +316,12 @@
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
++
++ interix*)
++ # We know the value 262144 and hardcode it with a safety zone (like BSD)
++ lt_cv_sys_max_cmd_len=196608
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -333,6 +335,17 @@
+ esac
+ fi
+ ;;
++ sco3.2v5*)
++ lt_cv_sys_max_cmd_len=102400
++ ;;
++ sysv5* | sco5v6* | sysv4.2uw2*)
++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++ if test -n "$kargmax"; then
++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
++ else
++ lt_cv_sys_max_cmd_len=32768
++ fi
++ ;;
+ *)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -356,7 +369,32 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6717,7 +6772,7 @@
+@@ -6673,7 +6765,7 @@
+
+
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -6681,7 +6773,7 @@
+
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -6747,17 +6839,19 @@
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
++ else
++ puts (dlerror ());
+
+ exit (status);
}]
EOF
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -365,7 +403,22 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) $1 ;;
-@@ -6771,7 +6826,7 @@
+ x$lt_dlneed_uscore) $2 ;;
+- x$lt_unknown|x*) $3 ;;
++ x$lt_dlunknown|x*) $3 ;;
+ esac
+ else :
+ # compilation failed
+@@ -6769,7 +6863,7 @@
+
+
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -6806,7 +6900,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -374,7 +427,25 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6860,20 +6915,13 @@
+@@ -6840,7 +6934,7 @@
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -6853,7 +6947,7 @@
+ ])
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ lt_cv_dlopen_self_static, [dnl
+ _LT_AC_TRY_DLOPEN_SELF(
+@@ -6895,20 +6989,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -396,14 +467,14 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6885,13 +6933,18 @@
+@@ -6920,13 +7007,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
fi
fi
@@ -419,7 +490,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6950,8 +7003,8 @@
+@@ -6985,8 +7077,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -430,7 +501,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7008,7 +7061,7 @@
+@@ -7043,7 +7135,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -439,7 +510,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7021,7 +7074,7 @@
+@@ -7056,7 +7148,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -448,7 +519,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7031,7 +7084,20 @@
+@@ -7066,7 +7158,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -470,7 +541,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7096,7 +7162,7 @@
+@@ -7131,7 +7236,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -479,7 +550,7 @@
;;
beos*)
-@@ -7105,7 +7171,7 @@
+@@ -7140,7 +7245,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -488,7 +559,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7121,7 +7187,7 @@
+@@ -7156,7 +7261,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -497,7 +568,7 @@
need_version=no
need_lib_prefix=no
-@@ -7133,7 +7199,8 @@
+@@ -7168,7 +7273,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -507,7 +578,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7163,7 +7230,7 @@
+@@ -7198,7 +7304,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -516,7 +587,7 @@
;;
esac
;;
-@@ -7186,7 +7253,7 @@
+@@ -7221,7 +7327,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -525,7 +596,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7209,7 +7276,7 @@
+@@ -7244,7 +7350,7 @@
dynamic_linker=no
;;
@@ -534,7 +605,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7221,8 +7288,17 @@
+@@ -7256,8 +7362,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -554,7 +625,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7240,7 +7316,7 @@
+@@ -7275,14 +7390,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -563,7 +634,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -7267,9 +7343,9 @@
+- *) # from 3.2 on
++ 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
+ ;;
+
+@@ -7302,9 +7422,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -575,7 +659,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7284,7 +7360,7 @@
+@@ -7319,7 +7439,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -584,7 +668,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7295,7 +7371,7 @@
+@@ -7330,7 +7450,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -593,7 +677,26 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7357,22 +7433,19 @@
+@@ -7342,6 +7462,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -7392,22 +7524,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -622,7 +725,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,
-@@ -7382,6 +7455,30 @@
+@@ -7417,6 +7546,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -653,7 +756,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7391,7 +7488,7 @@
+@@ -7426,7 +7579,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -662,9 +765,11 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7420,7 +7517,11 @@
+@@ -7454,8 +7607,13 @@
+
openbsd*)
version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -675,7 +780,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
-@@ -7440,7 +7541,7 @@
+@@ -7475,7 +7633,7 @@
os2*)
libname_spec='$name'
@@ -684,8 +789,83 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7586,7 +7687,9 @@
+@@ -7493,13 +7651,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -7525,7 +7676,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -7558,6 +7709,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -7571,6 +7745,11 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+@@ -7595,6 +7774,9 @@
+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+ fi
+ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
+
+ # Extract list of available tagged configurations in $ofile.
+ # Note that this assumes the entire list is on one line.
+@@ -7621,7 +7803,9 @@
+
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
@@ -695,7 +875,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7648,7 +7751,7 @@
+@@ -7683,7 +7867,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -704,7 +884,16 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7822,7 +7925,7 @@
+@@ -7721,7 +7905,7 @@
+
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -7857,7 +8041,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -713,7 +902,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
-@@ -7932,7 +8035,7 @@
+@@ -7967,7 +8151,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,
@@ -722,7 +911,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'*)
-@@ -7964,7 +8067,7 @@
+@@ -7999,7 +8183,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -731,14 +920,14 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7991,6 +8094,15 @@
+@@ -8026,6 +8210,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
-+ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
@@ -747,7 +936,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8024,44 +8136,36 @@
+@@ -8059,44 +8252,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -803,7 +992,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8077,7 +8181,7 @@
+@@ -8112,7 +8297,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -812,9 +1001,15 @@
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
-@@ -8094,42 +8198,21 @@
+@@ -8128,43 +8313,27 @@
+ esac
;;
++interix3*)
++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++ ;;
++
irix5* | irix6* | nonstopux*)
- case $host_os in
- irix5* | nonstopux*)
@@ -862,7 +1057,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -8148,19 +8231,14 @@
+@@ -8183,32 +8352,22 @@
;;
openbsd*)
@@ -881,18 +1076,107 @@
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
- lt_cv_file_magic_test_file=/shlib/libc.so
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+-sco3.2v5*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8170,7 +8248,6 @@
-
solaris*)
lt_cv_deplibs_check_method=pass_all
- lt_cv_file_magic_test_file=/lib/libc.so
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8278,13 +8355,13 @@
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ 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]]'
+@@ -8229,10 +8388,13 @@
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+ esac
+ ;;
+
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+@@ -8252,36 +8414,43 @@
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+ else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
++ lt_nm_to_check="${ac_tool_prefix}nm"
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ lt_nm_to_check="$lt_nm_to_check nm"
++ fi
++ for lt_tmp_nm in $lt_nm_to_check; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
+ ;;
+ esac
+- esac
+- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
+ done
+- IFS="$lt_save_ifs"
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -8313,13 +8482,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -913,7 +1197,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8303,13 +8380,13 @@
+@@ -8338,13 +8507,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -934,7 +1218,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8347,10 +8424,21 @@
+@@ -8382,10 +8551,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -944,7 +1228,7 @@
])# _LT_AC_LANG_CXX
+# _LT_AC_PROG_CXXCPP
-+# ---------------
++# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
@@ -957,28 +1241,69 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8423,6 +8511,10 @@
+@@ -8425,7 +8605,7 @@
+
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -8458,36 +8638,9 @@
+
_LT_AC_SYS_COMPILER
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+- case $host_os in
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+- ;;
+- esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
+- else
+- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+- fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+- [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -8436,7 +8528,7 @@
- fi
- if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
-+ if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
- else
- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8477,7 +8569,7 @@
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -8501,9 +8654,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+@@ -8512,7 +8665,7 @@
+
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -986,7 +1311,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8486,48 +8578,11 @@
+@@ -8521,48 +8674,11 @@
fi
;;
@@ -1037,7 +1362,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8552,7 +8607,7 @@
+@@ -8587,7 +8703,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1046,7 +1371,15 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8581,7 +8636,7 @@
+@@ -8599,6 +8715,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -8616,7 +8733,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1055,7 +1388,13 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8596,6 +8651,10 @@
+@@ -8626,11 +8743,15 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1066,7 +1405,20 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8617,7 +8676,7 @@
+@@ -8641,18 +8762,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+- unset lt_cv_prog_gnu_ld
++ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+- unset lt_cv_path_LD
++ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
compiler=$CC
_LT_AC_TAGVAR(compiler, $1)=$CC
@@ -1075,7 +1427,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8635,8 +8694,8 @@
+@@ -8670,8 +8791,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
@@ -1086,7 +1438,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8662,7 +8721,7 @@
+@@ -8697,7 +8818,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.
@@ -1095,7 +1447,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8692,8 +8751,22 @@
+@@ -8727,8 +8848,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1115,12 +1467,13 @@
+ ;;
+ esac
+ done
++ ;;
+ esac
+
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8710,7 +8783,7 @@
+@@ -8745,7 +8881,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1129,8 +1482,11 @@
# 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`
-@@ -8731,6 +8804,9 @@
+@@ -8764,8 +8900,12 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -1139,7 +1495,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8739,15 +8815,16 @@
+@@ -8774,15 +8914,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1160,39 +1516,65 @@
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.
-@@ -8756,13 +8833,12 @@
+@@ -8791,13 +8932,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8776,8 +8852,8 @@
+@@ -8806,21 +8946,31 @@
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
# Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -8790,16 +8866,17 @@
+- chorus*)
+- case $cc_basename in
+- *)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
++
++ beos*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++ # support --undefined. This deserves some investigation. FIXME
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
++ chorus*)
++ case $cc_basename in
++ *)
++ # FIXME: insert proper C++ library support
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
esac
;;
-
-+
- cygwin* | mingw* | pw32*)
+@@ -8829,12 +8979,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1203,16 +1585,16 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8808,70 +8885,81 @@
+@@ -8843,70 +8993,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
@@ -1341,7 +1723,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8882,14 +8970,14 @@
+@@ -8917,14 +9078,14 @@
;;
esac
;;
@@ -1358,7 +1740,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8906,12 +8994,12 @@
+@@ -8941,12 +9102,12 @@
# location of the library.
case $cc_basename in
@@ -1374,7 +1756,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8920,11 +9008,11 @@
+@@ -8955,11 +9116,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.
@@ -1388,25 +1770,48 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8934,7 +9022,7 @@
+@@ -8969,33 +9130,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
+ case $host_cpu in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -8950,7 +9038,7 @@
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
esac
fi
- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+- ia64*)
+ case $host_cpu in
- hppa*64*)
++ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -8971,17 +9059,17 @@
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+- # but as the default
+- # location of the library.
+ ;;
+ *)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+@@ -9006,17 +9156,20 @@
esac
case $cc_basename in
@@ -1417,10 +1822,15 @@
;;
- aCC)
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ aCC*)
+ case $host_cpu in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
@@ -1428,14 +1838,19 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8997,12 +9085,12 @@
+@@ -9032,12 +9185,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
- case "$host_cpu" in
+- ia64*|hppa*64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
- ia64*|hppa*64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
@@ -1443,8 +1858,24 @@
;;
esac
fi
-@@ -9015,9 +9103,9 @@
+@@ -9048,11 +9204,25 @@
+ ;;
+ esac
;;
++ interix3*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
irix5* | irix6*)
case $cc_basename in
- CC)
@@ -1455,7 +1886,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9028,9 +9116,9 @@
+@@ -9063,9 +9233,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1467,7 +1898,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9041,14 +9129,14 @@
+@@ -9076,14 +9246,14 @@
;;
linux*)
case $cc_basename in
@@ -1485,7 +1916,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9066,20 +9154,44 @@
+@@ -9101,20 +9271,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1536,7 +1967,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9107,7 +9219,7 @@
+@@ -9142,7 +9336,7 @@
;;
mvs*)
case $cc_basename in
@@ -1545,7 +1976,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9117,7 +9229,7 @@
+@@ -9152,7 +9346,7 @@
;;
esac
;;
@@ -1554,7 +1985,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -9128,15 +9240,31 @@
+@@ -9163,15 +9357,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::"'
;;
@@ -1588,7 +2019,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9146,14 +9274,14 @@
+@@ -9181,14 +9391,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1606,7 +2037,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9171,7 +9299,7 @@
+@@ -9206,7 +9416,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1615,7 +2046,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9190,13 +9318,13 @@
+@@ -9225,13 +9435,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -1631,7 +2062,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9205,17 +9333,17 @@
+@@ -9240,17 +9450,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -1653,7 +2084,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9234,7 +9362,7 @@
+@@ -9269,7 +9479,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1662,17 +2093,23 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9258,7 +9386,7 @@
- sco*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case $cc_basename in
+@@ -9290,27 +9500,14 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- sco*)
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case $cc_basename in
- CC)
-+ CC*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-@@ -9270,12 +9398,12 @@
- ;;
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- esac
+- ;;
sunos4*)
case $cc_basename in
- CC)
@@ -1686,7 +2123,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9288,36 +9416,33 @@
+@@ -9323,36 +9520,33 @@
;;
solaris*)
case $cc_basename in
@@ -1735,7 +2172,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9325,9 +9450,9 @@
+@@ -9360,9 +9554,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -1747,7 +2184,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9337,9 +9462,9 @@
+@@ -9372,9 +9566,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -1759,7 +2196,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9348,9 +9473,9 @@
+@@ -9383,9 +9577,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1771,8 +2208,65 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9368,7 +9493,7 @@
+@@ -9398,12 +9592,63 @@
+ ;;
+ esac
;;
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
++ ;;
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ # For security reasons, it is highly recommended that you always
++ # use absolute paths for naming shared libraries, and exclude the
++ # DT_RUNPATH tag from executables and libraries. But doing so
++ # requires that you compile everything twice, which is a pain.
++ # So that behaviour is only enabled if SCOABSPATH is set to a
++ # non-empty value in the environment. Most likely only useful for
++ # creating official distributions of packages.
++ # This is a hack until libtool officially supports absolute path
++ # names for shared libraries.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
+ ;;
tandem*)
case $cc_basename in
- NCC)
@@ -1780,7 +2274,25 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9478,7 +9603,7 @@
+@@ -9440,8 +9685,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -9459,7 +9702,7 @@
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
++# ------------------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+@@ -9513,7 +9756,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.
@@ -1789,7 +2301,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9518,7 +9643,7 @@
+@@ -9553,7 +9796,7 @@
fi
;;
@@ -1798,13 +2310,21 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9554,6 +9679,21 @@
+@@ -9589,13 +9832,37 @@
$rm -f confest.$objext
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
++interix3*)
++ # Interix 3.5 installs completely hosed .la files for C++, so rather than
++ # hack all around it, let's just trust "g++" to DTRT.
++ _LT_AC_TAGVAR(predep_objects,$1)=
++ _LT_AC_TAGVAR(postdep_objects,$1)=
++ _LT_AC_TAGVAR(postdeps,$1)=
++ ;;
++
+solaris*)
+ case $cc_basename in
+ CC*)
@@ -1814,13 +2334,22 @@
+ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+ ;;
+ esac
++ ;;
+esac
+])
+
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -9604,12 +9744,16 @@
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+
+ # AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
++# --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -9639,12 +9906,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1838,7 +2367,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9619,7 +9763,7 @@
+@@ -9654,7 +9925,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1847,7 +2376,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9627,8 +9771,10 @@
+@@ -9662,8 +9933,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1860,7 +2389,25 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9679,20 +9825,27 @@
+@@ -9673,8 +9946,6 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+
+@@ -9684,8 +9955,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -9714,20 +9983,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -1889,7 +2436,25 @@
## 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
-@@ -9739,11 +9892,16 @@
+@@ -9739,8 +10015,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -9750,7 +10024,7 @@
+
+
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
++# -------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -9774,11 +10048,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -1906,7 +2471,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9769,11 +9927,12 @@
+@@ -9804,11 +10083,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1916,12 +2481,12 @@
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9823,7 +9982,7 @@
+@@ -9858,7 +10138,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1930,7 +2495,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9889,11 +10048,11 @@
+@@ -9924,11 +10204,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -1944,7 +2509,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9924,6 +10083,12 @@
+@@ -9959,6 +10239,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -1957,7 +2522,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9954,7 +10119,7 @@
+@@ -9970,6 +10256,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+@@ -9989,7 +10278,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1966,7 +2541,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9985,7 +10150,7 @@
+@@ -10020,7 +10309,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1975,7 +2550,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10000,7 +10165,7 @@
+@@ -10035,7 +10324,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -1984,7 +2559,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10229,7 +10394,10 @@
+@@ -10264,7 +10553,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.
@@ -1996,7 +2571,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10271,9 +10439,6 @@
+@@ -10306,9 +10598,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2006,7 +2581,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -10295,6 +10460,13 @@
+@@ -10330,14 +10619,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2020,16 +2595,26 @@
irix* | nonstopux*)
symcode='[[BCDEGRST]]'
;;
-@@ -10302,7 +10474,7 @@
+ osf*)
symcode='[[BCDEGQRST]]'
;;
- solaris* | sysv5*)
+-solaris* | sysv5*)
- symcode='[[BDT]]'
++solaris*)
+ symcode='[[BDRT]]'
++ ;;
++sco3.2v5*)
++ symcode='[[DT]]'
++ ;;
++sysv4.2uw2*)
++ symcode='[[DT]]'
++ ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++ symcode='[[ABDT]]'
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10320,14 +10492,17 @@
+@@ -10355,14 +10660,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2049,7 +2634,18 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10491,7 +10666,7 @@
+@@ -10518,6 +10826,10 @@
+ # DJGPP does not support shared libraries at all
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -10526,7 +10838,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2058,7 +2654,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10516,18 +10691,28 @@
+@@ -10551,18 +10863,28 @@
;;
chorus*)
case $cc_basename in
@@ -2090,7 +2686,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10535,22 +10720,22 @@
+@@ -10570,22 +10892,22 @@
;;
esac
;;
@@ -2103,7 +2699,8 @@
- CC)
+ CC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
@@ -2111,14 +2708,21 @@
- aCC)
+ aCC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10565,7 +10750,7 @@
+@@ -10598,9 +10920,13 @@
+ ;;
+ esac
;;
++ interix*)
++ # This is c89, which is MS Visual C++ (no shared libs)
++ # Anyone wants to do a port?
++ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
- CC)
@@ -2126,7 +2730,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -10576,18 +10761,24 @@
+@@ -10611,18 +10937,24 @@
;;
linux*)
case $cc_basename in
@@ -2155,7 +2759,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10604,25 +10795,25 @@
+@@ -10639,25 +10971,25 @@
;;
mvs*)
case $cc_basename in
@@ -2186,17 +2790,19 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10638,7 +10829,7 @@
+@@ -10671,24 +11003,15 @@
;;
- sco*)
- case $cc_basename in
+ psos*)
+ ;;
+- sco*)
+- case $cc_basename in
- CC)
-+ CC*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
- ;;
- *)
-@@ -10647,13 +10838,13 @@
- ;;
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
solaris*)
case $cc_basename in
- CC)
@@ -2211,7 +2817,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10663,12 +10854,12 @@
+@@ -10698,12 +11021,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2226,7 +2832,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10678,7 +10869,7 @@
+@@ -10713,7 +11036,7 @@
;;
tandem*)
case $cc_basename in
@@ -2235,7 +2841,35 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10749,7 +10940,7 @@
+@@ -10721,7 +11044,14 @@
+ ;;
+ esac
+ ;;
+- unixware*)
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ esac
+ ;;
+ vxworks*)
+ ;;
+@@ -10768,6 +11098,11 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+@@ -10784,7 +11119,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2244,7 +2878,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10775,6 +10966,16 @@
+@@ -10810,6 +11145,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2261,7 +2895,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10786,7 +10987,7 @@
+@@ -10821,7 +11166,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2270,7 +2904,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10810,12 +11011,19 @@
+@@ -10845,12 +11190,19 @@
;;
linux*)
@@ -2291,9 +2925,15 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10836,9 +11044,14 @@
+@@ -10865,15 +11217,15 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+- ;;
+-
solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -2307,10 +2947,25 @@
;;
sunos4*)
-@@ -10860,6 +11073,11 @@
+@@ -10882,7 +11234,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -10895,6 +11247,17 @@
fi
;;
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
+ unicos*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
@@ -2319,7 +2974,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10887,7 +11105,7 @@
+@@ -10922,7 +11285,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2328,19 +2983,39 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10920,7 +11138,10 @@
+@@ -10931,6 +11294,16 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+ ;;
+ esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ $lt_tmp_static_flag,
++ [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
+
+
+@@ -10955,7 +11328,13 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
++ kfreebsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ linux*)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10946,7 +11167,7 @@
+@@ -10981,7 +11360,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -2349,7 +3024,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10963,7 +11184,8 @@
+@@ -10998,7 +11377,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -2359,7 +3034,18 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -10983,6 +11205,27 @@
+@@ -11008,6 +11388,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -11018,6 +11402,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -2387,7 +3073,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11020,7 +11263,7 @@
+@@ -11055,7 +11460,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -2396,7 +3082,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11030,13 +11273,13 @@
+@@ -11065,13 +11470,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -2409,20 +3095,36 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -11045,19 +11288,51 @@
+@@ -11080,23 +11485,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
- ld_shlibs=no
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
+ fi
+ ;;
+
+- netbsd*)
++ interix3*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ linux*)
@@ -2454,10 +3156,9 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -2470,7 +3171,12 @@
fi
;;
-@@ -11075,8 +11350,8 @@
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<EOF 1>&2
+@@ -11110,13 +11562,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2481,8 +3187,40 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11091,24 +11366,19 @@
+ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -11126,24 +11605,19 @@
+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -2513,7 +3251,16 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11142,9 +11412,20 @@
+@@ -11155,7 +11629,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -11177,9 +11651,21 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -2529,6 +3276,7 @@
+ break
+ fi
+ done
++ ;;
+ esac
- # KDE requires run time linking. Make it the default.
@@ -2536,7 +3284,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11161,7 +11442,7 @@
+@@ -11196,7 +11682,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -2545,8 +3293,11 @@
# 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`
-@@ -11182,6 +11463,9 @@
+@@ -11215,8 +11701,12 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -2555,16 +3306,19 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11190,29 +11474,29 @@
+@@ -11224,30 +11714,30 @@
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
else
- shared_flag='-qmkshrobj'
+- fi
+ shared_flag='${wl}-bM:SRE'
- fi
++ fi
fi
fi
@@ -2584,28 +3338,34 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11226,8 +11510,8 @@
+@@ -11256,13 +11746,11 @@
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
# Exported symbols can be pulled into shared objects from archives
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -11240,7 +11524,7 @@
+@@ -11275,7 +11763,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2614,7 +3374,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11250,69 +11534,69 @@
+@@ -11285,69 +11773,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -2730,18 +3490,27 @@
;;
dgux*)
-@@ -11345,8 +11629,8 @@
+@@ -11380,16 +11868,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11354,7 +11638,7 @@
+ ;;
++
++ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
++ kfreebsd*-gnu)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ ;;
hpux9*)
if test "$GCC" = yes; then
@@ -2750,15 +3519,41 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11370,16 +11654,16 @@
+@@ -11403,47 +11900,62 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
- hpux10* | hpux11*)
+- hpux10* | hpux11*)
++ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
- hppa*64*|ia64*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ hppa*64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
@@ -2767,21 +3562,52 @@
esac
else
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
- hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
-@@ -11389,7 +11673,7 @@
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
+ case $host_cpu in
- hppa*64*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-@@ -11422,7 +11706,7 @@
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- ;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+@@ -11457,7 +11969,7 @@
+
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -2789,7 +3615,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11432,7 +11716,7 @@
+@@ -11467,7 +11979,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -2798,7 +3624,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11455,7 +11739,8 @@
+@@ -11490,7 +12002,8 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -2808,7 +3634,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11465,7 +11750,7 @@
+@@ -11500,7 +12013,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -2817,7 +3643,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11476,14 +11761,14 @@
+@@ -11511,14 +12024,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -2834,7 +3660,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11495,13 +11780,13 @@
+@@ -11530,13 +12043,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2850,7 +3676,18 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11520,10 +11805,12 @@
+@@ -11544,21 +12057,15 @@
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+- sco3.2v5*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -2865,7 +3702,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11532,8 +11819,18 @@
+@@ -11567,8 +12074,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2886,7 +3723,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11542,7 +11839,7 @@
+@@ -11577,7 +12094,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.
@@ -2895,19 +3732,86 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11602,9 +11899,9 @@
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+@@ -11625,36 +12142,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
+- runpath_var='LD_RUN_PATH'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- sysv5*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11662,7 +11959,7 @@
++
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -11672,11 +12198,6 @@
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -11697,13 +12218,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2916,7 +3820,14 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11796,7 +12093,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -11831,7 +12353,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
@@ -2925,75 +3836,15 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- ascend/Makefile.in
-+++ ascend/Makefile.in
-@@ -309,6 +309,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@
-@@ -610,7 +613,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*) \
-@@ -648,9 +651,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
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- ascend/pics/Makefile.in
-+++ ascend/pics/Makefile.in
-@@ -237,6 +237,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@
-@@ -640,7 +643,7 @@
- all: docs-am all-am
-
- .SUFFIXES:
--$(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*) \
-@@ -678,9 +681,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
-
- mostlyclean-libtool:
--- autocorrect/Makefile.in
+++ autocorrect/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3003,7 +3854,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -533,7 +536,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -3012,7 +3863,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -560,9 +563,9 @@
+@@ -571,9 +574,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3049,8 +3900,8 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_LIBDIR PG_INCDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_LIBDIR RUBY_LIBRUBYARG compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE ascend_SUBDIR_included_TRUE ascend_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_LIBDIR PG_INCDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_LIBDIR RUBY_LIBRUBYARG compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE ascend_SUBDIR_included_TRUE ascend_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE compile_kexi_reports_plugin_TRUE compile_kexi_reports_plugin_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3063,7 +3914,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
-@@ -2094,6 +2096,31 @@
+@@ -2109,6 +2111,31 @@
@@ -3095,7 +3946,7 @@
unset CDPATH
-@@ -6746,183 +6773,6 @@
+@@ -6838,183 +6865,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3279,7 +4130,7 @@
fi
-@@ -7097,7 +6947,7 @@
+@@ -7189,7 +7039,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
@@ -3288,7 +4139,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7202,7 +7052,7 @@
+@@ -7294,7 +7144,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,
@@ -3297,7 +4148,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'*)
-@@ -7236,7 +7086,7 @@
+@@ -7328,7 +7178,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3306,14 +4157,14 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7266,6 +7116,15 @@
+@@ -7358,6 +7208,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ darwin*)
+ if test "$GCC" = yes; then
-+ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
@@ -3322,7 +4173,75 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7352,44 +7211,36 @@
+@@ -7368,36 +7227,43 @@
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+ else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
++ lt_nm_to_check="${ac_tool_prefix}nm"
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ lt_nm_to_check="$lt_nm_to_check nm"
++ fi
++ for lt_tmp_nm in $lt_nm_to_check; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
+ ;;
+ esac
+- esac
+- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
+ done
+- IFS="$lt_save_ifs"
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi
+ fi
+@@ -7444,44 +7310,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3377,7 +4296,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7405,7 +7256,7 @@
+@@ -7497,7 +7355,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3386,9 +4305,15 @@
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
-@@ -7422,42 +7273,21 @@
+@@ -7513,43 +7371,27 @@
+ esac
;;
++interix3*)
++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
++ ;;
++
irix5* | irix6* | nonstopux*)
- case $host_os in
- irix5* | nonstopux*)
@@ -3436,7 +4361,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
-@@ -7476,19 +7306,14 @@
+@@ -7568,32 +7410,22 @@
;;
openbsd*)
@@ -3455,27 +4380,58 @@
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
- lt_cv_file_magic_test_file=/shlib/libc.so
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+-sco3.2v5*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7498,7 +7323,6 @@
-
solaris*)
lt_cv_deplibs_check_method=pass_all
- lt_cv_file_magic_test_file=/lib/libc.so
;;
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7575,7 +7399,7 @@
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ 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]'
+@@ -7614,10 +7446,13 @@
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+ esac
;;
+
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+@@ -7633,6 +7468,9 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+
+@@ -7667,7 +7505,7 @@
+ ;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7578 "configure"' > conftest.$ac_ext
-+ echo '#line 7402 "configure"' > conftest.$ac_ext
+- echo '#line 7670 "configure"' > conftest.$ac_ext
++ echo '#line 7508 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7618,14 +7442,13 @@
+@@ -7710,14 +7548,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -3492,7 +4448,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7637,7 +7460,6 @@
+@@ -7729,7 +7566,6 @@
esac
;;
*64-bit*)
@@ -3500,8 +4456,35 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -8124,6 +7946,243 @@
+@@ -7824,6 +7660,26 @@
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
++sparc*-*solaris*)
++ # Find out which ABI we are using.
++ echo 'int i;' > 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); }; then
++ case `/usr/bin/file conftest.o` in
++ *64-bit*)
++ case $lt_cv_prog_gnu_ld in
++ yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ *) LD="${LD-ld} -64" ;;
++ esac
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++
+ esac
+
+@@ -8216,6 +8072,243 @@
+
done
+
@@ -3744,16 +4727,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8216,7 +8275,7 @@
+@@ -8308,7 +8401,7 @@
# Provide some information about the compiler.
--echo "$as_me:8219:" \
-+echo "$as_me:8278:" \
+-echo "$as_me:8311:" \
++echo "$as_me:8404:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8369,7 +8428,7 @@
+@@ -8461,7 +8554,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -3762,7 +4745,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8398,20 +8457,53 @@
+@@ -8490,20 +8583,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -3786,6 +4769,12 @@
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
++
++ interix*)
++ # We know the value 262144 and hardcode it with a safety zone (like BSD)
++ lt_cv_sys_max_cmd_len=196608
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -3799,6 +4788,17 @@
+ esac
+ fi
+ ;;
++ sco3.2v5*)
++ lt_cv_sys_max_cmd_len=102400
++ ;;
++ sysv5* | sco5v6* | sysv4.2uw2*)
++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++ if test -n "$kargmax"; then
++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
++ else
++ lt_cv_sys_max_cmd_len=32768
++ fi
++ ;;
+ *)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -3822,7 +4822,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8448,9 +8540,6 @@
+@@ -8540,9 +8683,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -3832,7 +4832,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8472,6 +8561,13 @@
+@@ -8564,14 +8704,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -3846,16 +4846,26 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8479,7 +8575,7 @@
+ osf*)
symcode='[BCDEGQRST]'
;;
- solaris* | sysv5*)
+-solaris* | sysv5*)
- symcode='[BDT]'
++solaris*)
+ symcode='[BDRT]'
++ ;;
++sco3.2v5*)
++ symcode='[DT]'
++ ;;
++sysv4.2uw2*)
++ symcode='[DT]'
++ ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++ symcode='[ABDT]'
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8497,14 +8593,17 @@
+@@ -8589,14 +8745,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -3875,7 +4885,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8666,7 +8765,7 @@
+@@ -8758,7 +8917,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -3884,7 +4894,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8686,7 +8785,7 @@
+@@ -8778,7 +8937,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -3893,7 +4903,26 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8971,6 +9070,17 @@
+@@ -9035,6 +9194,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -9054,15 +9214,26 @@
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -3911,7 +4940,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8996,7 +9106,7 @@
+@@ -9088,7 +9259,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -3920,7 +4949,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
-@@ -9058,7 +9168,7 @@
+@@ -9150,7 +9321,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -3929,46 +4958,91 @@
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,6 +9267,20 @@
+@@ -9245,68 +9416,25 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+-#
+-# Check for any special shared library compilation flags.
+-#
+-lt_prog_cc_shlib=
+-if test "$GCC" = no; then
+- case $host_os in
+- sco3.2v5*)
+- lt_prog_cc_shlib='-belf'
+- ;;
+- esac
+-fi
+-if test -n "$lt_prog_cc_shlib"; then
+- { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
+-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
+- if echo "$old_CC $old_CFLAGS " | grep "[ ]$lt_prog_cc_shlib[ ]" >/dev/null; then :
+- else
+- { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+- lt_cv_prog_cc_can_build_shared=no
+- fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
+-if test "${lt_prog_compiler_static_works+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- lt_prog_compiler_static_works=no
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
+- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test -s conftest.err; then
+- # Append any errors to the config.log.
+- cat conftest.err 1>&5
+- else
+- lt_prog_compiler_static_works=yes
+- fi
+- fi
+- $rm conftest*
+- LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+-
+-if test x"$lt_prog_compiler_static_works" = xyes; then
+- :
+-else
+- lt_prog_compiler_static=
+-fi
+-
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
-+
-+
- #
- # Check for any special shared library compilation flags.
- #
-@@ -9193,11 +9317,16 @@
- LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
- printf "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-- # The compiler can only warn and ignore the option if not recognized
-+ # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&5
-+ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if diff conftest.exp conftest.er2 >/dev/null; then
-+ lt_prog_compiler_static_works=yes
-+ fi
- else
- lt_prog_compiler_static_works=yes
- fi
-@@ -9243,18 +9372,20 @@
+
+
+ ## CAVEAT EMPTOR:
+@@ -9335,18 +9463,20 @@
# 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 \
@@ -3976,25 +5050,37 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9249: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9378: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9341: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9469: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9253: \$? = $ac_status" >&5
-+ echo "$as_me:9382: \$? = $ac_status" >&5
+- echo "$as_me:9345: \$? = $ac_status" >&5
++ echo "$as_me:9473: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9331,7 +9462,7 @@
+@@ -9407,6 +9537,11 @@
+ lt_prog_compiler_pic='-fno-common'
+ ;;
+
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+@@ -9423,7 +9558,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4003,7 +5089,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9357,6 +9488,16 @@
+@@ -9449,6 +9584,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4020,7 +5106,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9368,7 +9509,7 @@
+@@ -9460,7 +9605,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.
@@ -4029,7 +5115,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9392,12 +9533,19 @@
+@@ -9484,12 +9629,19 @@
;;
linux*)
@@ -4050,9 +5136,15 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9418,9 +9566,14 @@
+@@ -9504,15 +9656,15 @@
+ lt_prog_compiler_static='-non_shared'
;;
+- sco3.2v5*)
+- lt_prog_compiler_pic='-Kpic'
+- lt_prog_compiler_static='-dn'
+- ;;
+-
solaris*)
- lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
@@ -4066,10 +5158,25 @@
;;
sunos4*)
-@@ -9442,6 +9595,11 @@
+@@ -9521,7 +9673,7 @@
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+@@ -9534,6 +9686,17 @@
fi
;;
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ ;;
++
+ unicos*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_can_build_shared=no
@@ -4078,7 +5185,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9476,18 +9634,20 @@
+@@ -9568,18 +9731,20 @@
# 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 \
@@ -4086,25 +5193,25 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9482: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9640: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9574: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9737: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9486: \$? = $ac_status" >&5
-+ echo "$as_me:9644: \$? = $ac_status" >&5
+- echo "$as_me:9578: \$? = $ac_status" >&5
++ echo "$as_me:9741: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9508,7 +9668,7 @@
+@@ -9600,7 +9765,7 @@
fi
fi
@@ -4113,7 +5220,56 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9530,38 +9690,36 @@
+@@ -9610,6 +9775,48 @@
+ ;;
+ esac
+
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_prog_compiler_static_works=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++ printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works=yes
++ fi
++ else
++ lt_prog_compiler_static_works=yes
++ fi
++ fi
++ $rm conftest*
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++
++if test x"$lt_prog_compiler_static_works" = xyes; then
++ :
++else
++ lt_prog_compiler_static=
++fi
++
++
+ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+@@ -9622,38 +9829,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4134,21 +5290,21 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9549: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9702: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9641: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9841: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9553: \$? = $ac_status" >&5
-+ echo "$as_me:9706: \$? = $ac_status" >&5
+- echo "$as_me:9645: \$? = $ac_status" >&5
++ echo "$as_me:9845: \$? = $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
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
fi
fi
@@ -4164,7 +5320,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9632,6 +9790,16 @@
+@@ -9724,6 +9929,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -4181,7 +5337,18 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9652,6 +9820,27 @@
+@@ -9734,6 +9949,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -9744,6 +9963,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4209,7 +5376,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9689,7 +9878,7 @@
+@@ -9781,7 +10021,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4218,7 +5385,7 @@
else
ld_shlibs=no
fi
-@@ -9699,13 +9888,13 @@
+@@ -9791,13 +10031,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'
@@ -4231,21 +5398,36 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# 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
-@@ -9714,19 +9903,51 @@
+@@ -9806,23 +10046,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
++ interix3*)
++ hardcode_direct=no
++ hardcode_shlibpath_var=no
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -4291,7 +5473,12 @@
fi
;;
-@@ -9744,8 +9965,8 @@
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ cat <<EOF 1>&2
+@@ -9836,13 +10123,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4302,8 +5489,40 @@
else
ld_shlibs=no
fi
-@@ -9760,24 +9981,19 @@
+ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++ ld_shlibs=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ ld_shlibs=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -9852,24 +10166,19 @@
+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -4334,7 +5553,16 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9811,9 +10027,20 @@
+@@ -9881,7 +10190,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+@@ -9903,9 +10212,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
@@ -4350,6 +5578,7 @@
+ break
+ fi
+ done
++ ;;
+ esac
- # KDE requires run time linking. Make it the default.
@@ -4357,7 +5586,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9830,7 +10057,7 @@
+@@ -9922,7 +10243,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4366,8 +5595,11 @@
# 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`
-@@ -9851,6 +10078,9 @@
+@@ -9941,8 +10262,12 @@
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -4376,16 +5608,19 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9859,21 +10089,22 @@
+@@ -9950,22 +10275,23 @@
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
else
- shared_flag='-qmkshrobj'
+- fi
+ shared_flag='${wl}-bM:SRE'
- fi
++ fi
fi
fi
@@ -4404,7 +5639,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9924,14 +10155,13 @@
+@@ -10016,14 +10342,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4412,28 +5647,34 @@
- archive_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
- archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9995,8 +10225,8 @@
+@@ -10082,13 +10407,11 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag=' ${wl}-bernotok'
+ allow_undefined_flag=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec=' '
+- whole_archive_flag_spec=' '
++ whole_archive_flag_spec='$convenience'
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -10009,7 +10239,7 @@
+@@ -10101,7 +10424,7 @@
ld_shlibs=no
;;
@@ -4442,7 +5683,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10019,13 +10249,13 @@
+@@ -10111,13 +10434,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -4459,7 +5700,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.
-@@ -10035,52 +10265,52 @@
+@@ -10127,52 +10450,52 @@
;;
darwin* | rhapsody*)
@@ -4552,18 +5793,27 @@
fi
;;
-@@ -10114,8 +10344,8 @@
+@@ -10206,16 +10529,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec='-R$libdir'
++ hardcode_direct=yes
++ hardcode_shlibpath_var=no
++ ;;
++
++ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
++ kfreebsd*-gnu)
++ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10123,7 +10353,7 @@
++ link_all_deplibs=no
+ ;;
hpux9*)
if test "$GCC" = yes; then
@@ -4572,15 +5822,41 @@
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
-@@ -10139,16 +10369,16 @@
+@@ -10229,47 +10561,62 @@
+ export_dynamic_flag_spec='${wl}-E'
+ ;;
- hpux10* | hpux11*)
+- hpux10* | hpux11*)
++ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator=:
++
++ hardcode_direct=yes
++ export_dynamic_flag_spec='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ hardcode_minus_L=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
- hppa*64*|ia64*)
-- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ hppa*64*)
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
@@ -4589,21 +5865,52 @@
esac
else
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
- hppa*64*|ia64*)
- archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ hppa*64*)
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
-@@ -10158,7 +10388,7 @@
+ *)
+- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator=:
++
+ case $host_cpu in
- hppa*64*)
- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10191,7 +10421,7 @@
+- hardcode_libdir_separator=:
+- hardcode_direct=no
+- hardcode_shlibpath_var=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- hardcode_minus_L=yes
+ ;;
+ *)
+- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator=:
+ hardcode_direct=yes
+ export_dynamic_flag_spec='${wl}-E'
+@@ -10283,7 +10630,7 @@
+
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -4611,7 +5918,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'
-@@ -10201,7 +10431,7 @@
+@@ -10293,7 +10640,7 @@
link_all_deplibs=yes
;;
@@ -4620,7 +5927,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10224,7 +10454,8 @@
+@@ -10316,7 +10663,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
@@ -4630,7 +5937,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10234,7 +10465,7 @@
+@@ -10326,7 +10674,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -4639,7 +5946,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10245,14 +10476,14 @@
+@@ -10337,14 +10685,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -4656,7 +5963,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'
-@@ -10264,13 +10495,13 @@
+@@ -10356,13 +10704,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -4672,7 +5979,18 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10289,10 +10520,12 @@
+@@ -10370,21 +10718,15 @@
+ hardcode_libdir_separator=:
+ ;;
+
+- sco3.2v5*)
+- archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var=no
+- export_dynamic_flag_spec='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -4687,7 +6005,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'
-@@ -10301,8 +10534,18 @@
+@@ -10393,8 +10735,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -4708,7 +6026,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10311,7 +10554,7 @@
+@@ -10403,7 +10755,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.
@@ -4717,19 +6035,94 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10371,9 +10614,9 @@
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag='${wl}-z ${wl}text'
+@@ -10451,36 +10803,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct=yes
+- hardcode_minus_L=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ no_undefined_flag='${wl}-z,text'
++ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+- no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var=no
+ ;;
+
+- sysv5*)
+- no_undefined_flag=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- 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'
+- hardcode_libdir_flag_spec=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ no_undefined_flag='${wl}-z,text'
++ allow_undefined_flag='${wl}-z,nodefs'
++ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
++ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator=':'
++ link_all_deplibs=yes
++ export_dynamic_flag_spec='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var=no
-@@ -10479,7 +10722,7 @@
++
++ if test "$GCC" = yes; then
++ archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -10499,11 +10860,6 @@
+ echo "${ECHO_T}$ld_shlibs" >&6
+ test "$ld_shlibs" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -10536,6 +10892,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
++ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -10571,7 +10928,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4738,7 +6131,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10489,7 +10732,20 @@
+@@ -10581,7 +10938,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4760,7 +6153,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10554,7 +10810,7 @@
+@@ -10646,7 +11016,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4769,7 +6162,7 @@
;;
beos*)
-@@ -10563,7 +10819,7 @@
+@@ -10655,7 +11025,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -4778,7 +6171,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10579,7 +10835,7 @@
+@@ -10671,7 +11041,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -4787,7 +6180,7 @@
need_version=no
need_lib_prefix=no
-@@ -10591,7 +10847,8 @@
+@@ -10683,7 +11053,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -4797,7 +6190,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10621,7 +10878,7 @@
+@@ -10713,7 +11084,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -4806,7 +6199,7 @@
;;
esac
;;
-@@ -10644,7 +10901,7 @@
+@@ -10736,7 +11107,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -4815,7 +6208,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"`
-@@ -10667,7 +10924,7 @@
+@@ -10759,7 +11130,7 @@
dynamic_linker=no
;;
@@ -4824,7 +6217,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10679,8 +10936,17 @@
+@@ -10771,8 +11142,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -4844,7 +6237,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10698,7 +10964,7 @@
+@@ -10790,14 +11170,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -4853,7 +6246,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10725,9 +10991,9 @@
+- *) # from 3.2 on
++ 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
+ ;;
+
+@@ -10817,9 +11202,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -4865,7 +6271,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10742,7 +11008,7 @@
+@@ -10834,7 +11219,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4874,7 +6280,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10753,7 +11019,7 @@
+@@ -10845,7 +11230,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4883,7 +6289,26 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10815,22 +11081,19 @@
+@@ -10857,6 +11242,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -10907,22 +11304,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -4912,7 +6337,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,
-@@ -10840,6 +11103,30 @@
+@@ -10932,6 +11326,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4943,7 +6368,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10849,7 +11136,7 @@
+@@ -10941,7 +11359,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4952,9 +6377,11 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10878,7 +11165,11 @@
+@@ -10969,8 +11387,13 @@
+
openbsd*)
version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -4965,7 +6392,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
-@@ -10898,7 +11189,7 @@
+@@ -10990,7 +11413,7 @@
os2*)
libname_spec='$name'
@@ -4974,7 +6401,69 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11000,8 +11291,8 @@
+@@ -11008,13 +11431,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -11040,7 +11456,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -11073,6 +11489,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -11088,12 +11527,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -4985,16 +6474,34 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11660,7 +11951,7 @@
+@@ -11736,7 +12180,7 @@
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -11752,7 +12196,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11663 "configure"
-+#line 11954 "configure"
+-#line 11755 "configure"
++#line 12199 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11726,7 +12017,7 @@
+@@ -11809,6 +12253,8 @@
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
++ else
++ puts (dlerror ());
+
+ exit (status);
+ }
+@@ -11818,12 +12264,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5003,16 +6510,40 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11758,7 +12049,7 @@
+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+ esac
+ else :
+ # compilation failed
+@@ -11838,7 +12284,7 @@
+ echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+ echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+ if test "${lt_cv_dlopen_self_static+set}" = set; then
+@@ -11850,7 +12296,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11761 "configure"
-+#line 12052 "configure"
+-#line 11853 "configure"
++#line 12299 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11824,7 +12115,7 @@
+@@ -11907,6 +12353,8 @@
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
++ else
++ puts (dlerror ());
+
+ exit (status);
+ }
+@@ -11916,12 +12364,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5021,8 +6552,23 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11874,7 +12165,7 @@
+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+ esac
+ else :
+ # compilation failed
+@@ -11954,7 +12402,7 @@
+ fi
+
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+@@ -11966,7 +12414,7 @@
+
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
-case "$host_os" in
@@ -5030,7 +6576,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11883,47 +12174,10 @@
+@@ -11975,47 +12423,10 @@
fi
;;
@@ -5079,17 +6625,17 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11949,7 +12203,8 @@
+@@ -12041,7 +12452,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12063,11 +12318,11 @@
+@@ -12155,11 +12567,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5103,7 +6649,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12097,6 +12352,12 @@
+@@ -12189,6 +12601,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5116,7 +6662,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12127,7 +12388,7 @@
+@@ -12200,6 +12618,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler
+
+@@ -12219,7 +12640,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5125,7 +6681,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12158,7 +12419,7 @@
+@@ -12250,7 +12671,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5134,7 +6690,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12173,7 +12434,7 @@
+@@ -12265,7 +12686,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5143,7 +6699,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12400,7 +12661,10 @@
+@@ -12492,7 +12913,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.
@@ -5155,8 +6711,18 @@
fi
-@@ -12465,7 +12729,9 @@
+@@ -12527,6 +12951,9 @@
+ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+ fi
+ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
+ # Extract list of available tagged configurations in $ofile.
+ # Note that this assumes the entire list is on one line.
+@@ -12557,7 +12984,9 @@
+
case $tagname in
CXX)
- if test -n "$CXX" && test "X$CXX" != "Xno"; then
@@ -5166,7 +6732,15 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12502,7 +12768,7 @@
+@@ -12577,6 +13006,7 @@
+ hardcode_libdir_flag_spec_ld_CXX=
+ hardcode_libdir_separator_CXX=
+ hardcode_minus_L_CXX=no
++hardcode_shlibpath_var_CXX=unsupported
+ hardcode_automatic_CXX=no
+ module_cmds_CXX=
+ module_expsym_cmds_CXX=
+@@ -12594,7 +13024,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5175,20 +6749,35 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12523,6 +12789,20 @@
+@@ -12604,17 +13034,34 @@
+ lt_simple_compile_test_code="int some_variable = 0;\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
@@ -5196,7 +6785,20 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12544,7 +12824,16 @@
+@@ -12625,18 +13072,27 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+- unset lt_cv_prog_gnu_ld
++ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+- unset lt_cv_path_LD
++ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5214,7 +6816,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12615,7 +12904,7 @@
+@@ -12707,7 +13163,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,
@@ -5223,7 +6825,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'*)
-@@ -12649,7 +12938,7 @@
+@@ -12741,7 +13197,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5232,7 +6834,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12668,8 +12957,8 @@
+@@ -12760,8 +13216,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
@@ -5243,7 +6845,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12695,7 +12984,7 @@
+@@ -12787,7 +13243,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.
@@ -5252,7 +6854,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12726,8 +13015,22 @@
+@@ -12818,8 +13274,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5272,12 +6874,13 @@
+ ;;
+ esac
+ done
++ ;;
+ esac
+
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12744,7 +13047,7 @@
+@@ -12836,7 +13307,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5286,8 +6889,11 @@
# 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`
-@@ -12765,6 +13068,9 @@
+@@ -12855,8 +13326,12 @@
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_libdir_separator_CXX=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -5296,7 +6902,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12773,15 +13079,16 @@
+@@ -12865,15 +13340,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5317,39 +6923,55 @@
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.
-@@ -12840,13 +13147,12 @@
+@@ -12932,13 +13408,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
- archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_CXX="-z nodefs"
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12910,8 +13216,8 @@
+@@ -12997,16 +13472,26 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_CXX=' ${wl}-bernotok'
+ allow_undefined_flag_CXX=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols_CXX=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_CXX=' '
+- whole_archive_flag_spec_CXX=' '
++ whole_archive_flag_spec_CXX='$convenience'
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -12924,16 +13230,17 @@
- esac
- ;;
-
+
- cygwin* | mingw* | pw32*)
++ beos*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ allow_undefined_flag_CXX=unsupported
++ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++ # support --undefined. This deserves some investigation. FIXME
++ archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ else
++ ld_shlibs_CXX=no
++ fi
++ ;;
++
+ chorus*)
+ case $cc_basename in
+ *)
+@@ -13020,12 +13505,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'
@@ -5360,16 +6982,16 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# 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
-@@ -12942,70 +13249,81 @@
+@@ -13034,70 +13519,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
ld_shlibs_CXX=no
fi
@@ -5498,7 +7120,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13016,14 +13334,14 @@
+@@ -13108,14 +13604,14 @@
;;
esac
;;
@@ -5515,7 +7137,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13040,12 +13358,12 @@
+@@ -13132,12 +13628,12 @@
# location of the library.
case $cc_basename in
@@ -5531,7 +7153,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13054,11 +13372,11 @@
+@@ -13146,11 +13642,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.
@@ -5545,25 +7167,48 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13068,7 +13386,7 @@
+@@ -13160,33 +13656,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_CXX=:
++
+ case $host_cpu in
- hppa*64*)
- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -13084,7 +13402,7 @@
+- hardcode_libdir_separator_CXX=:
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_CXX='-L$libdir'
;;
+ *)
+- hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator_CXX=:
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ ;;
esac
fi
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_direct_CXX=no
+- hardcode_shlibpath_var_CXX=no
+- ;;
+- ia64*)
+ case $host_cpu in
- hppa*64*)
++ hppa*64*|ia64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -13105,17 +13423,17 @@
+- hardcode_minus_L_CXX=yes # Not in the search PATH,
+- # but as the default
+- # location of the library.
+ ;;
+ *)
+ hardcode_direct_CXX=yes
+@@ -13197,17 +13682,20 @@
esac
case $cc_basename in
@@ -5574,10 +7219,15 @@
;;
- aCC)
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ aCC*)
+ case $host_cpu in
- hppa*64*|ia64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ hppa*64*)
++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
@@ -5585,14 +7235,19 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13131,12 +13449,12 @@
+@@ -13223,12 +13711,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
- case "$host_cpu" in
+- ia64*|hppa*64*)
+- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+ case $host_cpu in
- ia64*|hppa*64*)
- archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ hppa*64*)
++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
@@ -5600,8 +7255,24 @@
;;
esac
fi
-@@ -13149,9 +13467,9 @@
+@@ -13239,11 +13730,25 @@
+ ;;
+ esac
;;
++ interix3*)
++ hardcode_direct_CXX=no
++ hardcode_shlibpath_var_CXX=no
++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_CXX='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
irix5* | irix6*)
case $cc_basename in
- CC)
@@ -5612,7 +7283,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13162,9 +13480,9 @@
+@@ -13254,9 +13759,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -5624,7 +7295,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13175,14 +13493,14 @@
+@@ -13267,14 +13772,14 @@
;;
linux*)
case $cc_basename in
@@ -5642,7 +7313,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13200,20 +13518,44 @@
+@@ -13292,20 +13797,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -5693,7 +7364,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13241,7 +13583,7 @@
+@@ -13333,7 +13862,7 @@
;;
mvs*)
case $cc_basename in
@@ -5702,7 +7373,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13251,7 +13593,7 @@
+@@ -13343,7 +13872,7 @@
;;
esac
;;
@@ -5711,7 +7382,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=
-@@ -13262,15 +13604,31 @@
+@@ -13354,15 +13883,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::"'
;;
@@ -5745,7 +7416,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13280,14 +13638,14 @@
+@@ -13372,14 +13917,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -5763,7 +7434,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13305,7 +13663,7 @@
+@@ -13397,7 +13942,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -5772,7 +7443,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13324,13 +13682,13 @@
+@@ -13416,13 +13961,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -5788,7 +7459,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13339,17 +13697,17 @@
+@@ -13431,17 +13976,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -5810,7 +7481,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13368,7 +13726,7 @@
+@@ -13460,7 +14005,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -5819,17 +7490,23 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13392,7 +13750,7 @@
- sco*)
- archive_cmds_need_lc_CXX=no
- case $cc_basename in
+@@ -13481,27 +14026,14 @@
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- sco*)
+- archive_cmds_need_lc_CXX=no
+- case $cc_basename in
- CC)
-+ CC*)
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- ;;
-@@ -13404,12 +13762,12 @@
- ;;
+- # FIXME: insert proper C++ library support
+- ld_shlibs_CXX=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- ld_shlibs_CXX=no
+- ;;
+- esac
+- ;;
sunos4*)
case $cc_basename in
- CC)
@@ -5843,7 +7520,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13422,36 +13780,33 @@
+@@ -13514,36 +14046,33 @@
;;
solaris*)
case $cc_basename in
@@ -5892,7 +7569,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13459,9 +13814,9 @@
+@@ -13551,9 +14080,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -5904,7 +7581,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13471,9 +13826,9 @@
+@@ -13563,9 +14092,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
@@ -5916,7 +7593,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13482,9 +13837,9 @@
+@@ -13574,9 +14103,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -5928,8 +7605,65 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13502,7 +13857,7 @@
+@@ -13589,12 +14118,63 @@
+ ;;
+ esac
;;
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
++ no_undefined_flag_CXX='${wl}-z,text'
++ archive_cmds_need_lc_CXX=no
++ hardcode_shlibpath_var_CXX=no
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
++ ;;
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ # For security reasons, it is highly recommended that you always
++ # use absolute paths for naming shared libraries, and exclude the
++ # DT_RUNPATH tag from executables and libraries. But doing so
++ # requires that you compile everything twice, which is a pain.
++ # So that behaviour is only enabled if SCOABSPATH is set to a
++ # non-empty value in the environment. Most likely only useful for
++ # creating official distributions of packages.
++ # This is a hack until libtool officially supports absolute path
++ # names for shared libraries.
++ no_undefined_flag_CXX='${wl}-z,text'
++ allow_undefined_flag_CXX='${wl}-z,nodefs'
+ archive_cmds_need_lc_CXX=no
++ hardcode_shlibpath_var_CXX=no
++ hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator_CXX=':'
++ link_all_deplibs_CXX=yes
++ export_dynamic_flag_spec_CXX='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
+ ;;
tandem*)
case $cc_basename in
- NCC)
@@ -5937,7 +7671,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13559,7 +13914,7 @@
+@@ -13651,7 +14231,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.
@@ -5946,7 +7680,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13599,7 +13954,7 @@
+@@ -13691,7 +14271,7 @@
fi
;;
@@ -5955,12 +7689,20 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13635,6 +13990,20 @@
+@@ -13727,6 +14307,29 @@
$rm -f confest.$objext
+# PORTME: override above test on systems where it is broken
+case $host_os in
++interix3*)
++ # Interix 3.5 installs completely hosed .la files for C++, so rather than
++ # hack all around it, let's just trust "g++" to DTRT.
++ predep_objects_CXX=
++ postdep_objects_CXX=
++ postdeps_CXX=
++ ;;
++
+solaris*)
+ case $cc_basename in
+ CC*)
@@ -5970,13 +7712,25 @@
+ postdeps_CXX='-lCstd -lCrun'
+ ;;
+ esac
++ ;;
+esac
+
+
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13690,7 +14059,7 @@
+@@ -13774,6 +14377,10 @@
+ # DJGPP does not support shared libraries at all
+ lt_prog_compiler_pic_CXX=
+ ;;
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ lt_prog_compiler_pic_CXX=-Kconform_pic
+@@ -13782,7 +14389,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -5985,7 +7739,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13715,18 +14084,28 @@
+@@ -13807,18 +14414,28 @@
;;
chorus*)
case $cc_basename in
@@ -6017,7 +7771,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13734,22 +14113,22 @@
+@@ -13826,22 +14443,22 @@
;;
esac
;;
@@ -6030,7 +7784,8 @@
- CC)
+ CC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
if test "$host_cpu" != ia64; then
lt_prog_compiler_pic_CXX='+Z'
fi
@@ -6038,14 +7793,21 @@
- aCC)
+ aCC*)
lt_prog_compiler_wl_CXX='-Wl,'
- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
- case "$host_cpu" in
++ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+ case $host_cpu in
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13764,7 +14143,7 @@
+@@ -13854,9 +14471,13 @@
+ ;;
+ esac
;;
++ interix*)
++ # This is c89, which is MS Visual C++ (no shared libs)
++ # Anyone wants to do a port?
++ ;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
- CC)
@@ -6053,7 +7815,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13775,18 +14154,24 @@
+@@ -13867,18 +14488,24 @@
;;
linux*)
case $cc_basename in
@@ -6081,7 +7843,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13803,25 +14188,25 @@
+@@ -13895,25 +14522,25 @@
;;
mvs*)
case $cc_basename in
@@ -6112,17 +7874,19 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13837,7 +14222,7 @@
+@@ -13927,24 +14554,15 @@
;;
- sco*)
- case $cc_basename in
+ psos*)
+ ;;
+- sco*)
+- case $cc_basename in
- CC)
-+ CC*)
- lt_prog_compiler_pic_CXX='-fPIC'
- ;;
- *)
-@@ -13846,13 +14231,13 @@
- ;;
+- lt_prog_compiler_pic_CXX='-fPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
solaris*)
case $cc_basename in
- CC)
@@ -6137,7 +7901,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13862,12 +14247,12 @@
+@@ -13954,12 +14572,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6152,7 +7916,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13877,7 +14262,7 @@
+@@ -13969,7 +14587,7 @@
;;
tandem*)
case $cc_basename in
@@ -6161,7 +7925,23 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13918,18 +14303,20 @@
+@@ -13977,7 +14595,14 @@
+ ;;
+ esac
+ ;;
+- unixware*)
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ case $cc_basename in
++ CC*)
++ lt_prog_compiler_wl_CXX='-Wl,'
++ lt_prog_compiler_pic_CXX='-KPIC'
++ lt_prog_compiler_static_CXX='-Bstatic'
++ ;;
++ esac
+ ;;
+ vxworks*)
+ ;;
+@@ -14010,18 +14635,20 @@
# 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 \
@@ -6169,25 +7949,25 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13924: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14309: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14016: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14641: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13928: \$? = $ac_status" >&5
-+ echo "$as_me:14313: \$? = $ac_status" >&5
+- echo "$as_me:14020: \$? = $ac_status" >&5
++ echo "$as_me:14645: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13950,7 +14337,7 @@
+@@ -14042,7 +14669,7 @@
fi
fi
@@ -6196,7 +7976,66 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13972,38 +14359,36 @@
+@@ -14052,11 +14679,53 @@
+ ;;
+ esac
+
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_prog_compiler_static_works_CXX=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++ printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works_CXX=yes
++ fi
++ else
++ lt_prog_compiler_static_works_CXX=yes
++ fi
++ fi
++ $rm conftest*
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
++
++if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++ :
++else
++ lt_prog_compiler_static_CXX=
++fi
++
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ lt_cv_prog_compiler_c_o_CXX=no
+ $rm -r conftest 2>/dev/null
+ mkdir conftest
+@@ -14064,38 +14733,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6217,21 +8056,21 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13991: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14371: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14083: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14745: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13995: \$? = $ac_status" >&5
-+ echo "$as_me:14375: \$? = $ac_status" >&5
+- echo "$as_me:14087: \$? = $ac_status" >&5
++ echo "$as_me:14749: \$? = $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
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_CXX=yes
fi
fi
@@ -6247,19 +8086,42 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14053,7 +14438,10 @@
+@@ -14145,7 +14812,13 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
++ kfreebsd*-gnu)
++ link_all_deplibs_CXX=no
++ ;;
+ linux*)
+ link_all_deplibs_CXX=no
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14136,7 +14524,7 @@
+@@ -14156,11 +14829,6 @@
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -14193,6 +14861,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl_CXX
++ pic_flag=$lt_prog_compiler_pic_CXX
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -14228,7 +14897,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6268,7 +8130,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14146,7 +14534,20 @@
+@@ -14238,7 +14907,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6290,7 +8152,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14211,7 +14612,7 @@
+@@ -14303,7 +14985,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6299,7 +8161,7 @@
;;
beos*)
-@@ -14220,7 +14621,7 @@
+@@ -14312,7 +14994,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6308,7 +8170,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14236,7 +14637,7 @@
+@@ -14328,7 +15010,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6317,7 +8179,7 @@
need_version=no
need_lib_prefix=no
-@@ -14248,7 +14649,8 @@
+@@ -14340,7 +15022,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6327,7 +8189,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14278,7 +14680,7 @@
+@@ -14370,7 +15053,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6336,7 +8198,7 @@
;;
esac
;;
-@@ -14301,7 +14703,7 @@
+@@ -14393,7 +15076,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6345,7 +8207,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"`
-@@ -14324,7 +14726,7 @@
+@@ -14416,7 +15099,7 @@
dynamic_linker=no
;;
@@ -6354,7 +8216,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14336,8 +14738,17 @@
+@@ -14428,8 +15111,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6374,7 +8236,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14355,7 +14766,7 @@
+@@ -14447,14 +15139,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6383,7 +8245,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14382,9 +14793,9 @@
+- *) # from 3.2 on
++ 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
+ ;;
+
+@@ -14474,9 +15171,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6395,7 +8270,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14399,7 +14810,7 @@
+@@ -14491,7 +15188,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6404,7 +8279,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14410,7 +14821,7 @@
+@@ -14502,7 +15199,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6413,7 +8288,26 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14472,22 +14883,19 @@
+@@ -14514,6 +15211,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -14564,22 +15273,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -6442,7 +8336,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,
-@@ -14497,6 +14905,30 @@
+@@ -14589,6 +15295,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6473,7 +8367,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14506,7 +14938,7 @@
+@@ -14598,7 +15328,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6482,9 +8376,11 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14535,7 +14967,11 @@
+@@ -14626,8 +15356,13 @@
+
openbsd*)
version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -6495,7 +8391,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
-@@ -14555,7 +14991,7 @@
+@@ -14647,7 +15382,7 @@
os2*)
libname_spec='$name'
@@ -6504,7 +8400,69 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14657,8 +15093,8 @@
+@@ -14665,13 +15400,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -14697,7 +15425,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -14730,6 +15458,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -14745,12 +15496,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -6515,93 +8473,1343 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -15317,7 +15753,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15320 "configure"
-+#line 15756 "configure"
- #include "confdefs.h"
+@@ -14782,1111 +15538,293 @@
+ enable_fast_install=needless
+ fi
- #if HAVE_DLFCN_H
-@@ -15383,7 +15819,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15415,7 +15851,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15418 "configure"
-+#line 15854 "configure"
- #include "confdefs.h"
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+- case $host_os in
+- darwin*)
+- if test -n "$STRIP" ; then
+- striplib="$STRIP -x"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+- ;;
+- *)
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++ # See if we are running on zsh, and set the options which allow our commands through
++ # without removal of \ escapes.
++ if test -n "${ZSH_VERSION+set}" ; then
++ setopt NO_GLOB_SUBST
++ fi
++ # Now quote all the things that may contain metacharacters while being
++ # careful not to overquote the AC_SUBSTed values. We take copies of the
++ # variables and quote the copies for generation of the libtool script.
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++ SED SHELL STRIP \
++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++ deplibs_check_method reload_flag reload_cmds need_locks \
++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++ lt_cv_sys_global_symbol_to_c_name_address \
++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++ old_postinstall_cmds old_postuninstall_cmds \
++ compiler_CXX \
++ CC_CXX \
++ LD_CXX \
++ lt_prog_compiler_wl_CXX \
++ lt_prog_compiler_pic_CXX \
++ lt_prog_compiler_static_CXX \
++ lt_prog_compiler_no_builtin_flag_CXX \
++ export_dynamic_flag_spec_CXX \
++ thread_safe_flag_spec_CXX \
++ whole_archive_flag_spec_CXX \
++ enable_shared_with_static_runtimes_CXX \
++ old_archive_cmds_CXX \
++ old_archive_from_new_cmds_CXX \
++ predep_objects_CXX \
++ postdep_objects_CXX \
++ predeps_CXX \
++ postdeps_CXX \
++ compiler_lib_search_path_CXX \
++ archive_cmds_CXX \
++ archive_expsym_cmds_CXX \
++ postinstall_cmds_CXX \
++ postuninstall_cmds_CXX \
++ old_archive_from_expsyms_cmds_CXX \
++ allow_undefined_flag_CXX \
++ no_undefined_flag_CXX \
++ export_symbols_cmds_CXX \
++ hardcode_libdir_flag_spec_CXX \
++ hardcode_libdir_flag_spec_ld_CXX \
++ hardcode_libdir_separator_CXX \
++ hardcode_automatic_CXX \
++ module_cmds_CXX \
++ module_expsym_cmds_CXX \
++ lt_cv_prog_compiler_c_o_CXX \
++ exclude_expsyms_CXX \
++ include_expsyms_CXX; do
++
++ case $var in
++ old_archive_cmds_CXX | \
++ old_archive_from_new_cmds_CXX | \
++ archive_cmds_CXX | \
++ archive_expsym_cmds_CXX | \
++ module_cmds_CXX | \
++ module_expsym_cmds_CXX | \
++ old_archive_from_expsyms_cmds_CXX | \
++ export_symbols_cmds_CXX | \
++ extract_expsyms_cmds | reload_cmds | finish_cmds | \
++ postinstall_cmds | postuninstall_cmds | \
++ old_postinstall_cmds | old_postuninstall_cmds | \
++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++ # Double-quote double-evaled strings.
++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++ ;;
++ *)
++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++ ;;
++ esac
++ done
++
++ case $lt_echo in
++ *'\$0 --fallback-echo"')
++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+ ;;
+ esac
+-fi
- #if HAVE_DLFCN_H
-@@ -15481,7 +15917,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15532,7 +15968,8 @@
- # Now quote all the things that may contain metacharacters while being
- # careful not to overquote the AC_SUBSTed values. We take copies of the
- # variables and quote the copies for generation of the libtool script.
-- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+ SED SHELL STRIP \
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
- deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15632,6 +16069,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
+-if test "x$enable_dlopen" != xyes; then
+- enable_dlopen=unknown
+- enable_dlopen_self=unknown
+- enable_dlopen_self_static=unknown
+-else
+- lt_cv_dlopen=no
+- lt_cv_dlopen_libs=
++cfgfile="$ofile"
+
+- case $host_os in
+- beos*)
+- lt_cv_dlopen="load_add_on"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+- ;;
++ cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+
+- mingw* | pw32*)
+- lt_cv_dlopen="LoadLibrary"
+- lt_cv_dlopen_libs=
+- ;;
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+
+- cygwin*)
+- lt_cv_dlopen="dlopen"
+- lt_cv_dlopen_libs=
+- ;;
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
+
+- darwin*)
+- # if libdl is installed we need to link against it
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_dl_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
+
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+- lt_cv_dlopen="dyld"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+-fi
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
+
+- ;;
++# The host system.
++host_alias=$host_alias
++host=$host
+host_os=$host_os
-+
+
+- *)
+- echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+-if test "${ac_cv_func_shl_load+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define shl_load innocuous_shl_load
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -15662,7 +16105,7 @@
- NM=$lt_NM
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shl_load (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
- # A symbol stripping program
--STRIP=$STRIP
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
+
+-#undef shl_load
++# A C compiler.
++LTCC=$lt_LTCC
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+-choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+
+-int
+-main ()
+-{
+-return f != shl_load;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_shl_load=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# A language-specific compiler.
++CC=$lt_compiler_CXX
+
+-ac_cv_func_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-if test $ac_cv_func_shl_load = yes; then
+- lt_cv_dlopen="shl_load"
+-else
+- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char shl_load ();
+-int
+-main ()
+-{
+-shl_load ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_dld_shl_load=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# An ERE matcher.
++EGREP=$lt_EGREP
+
+-ac_cv_lib_dld_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-if test $ac_cv_lib_dld_shl_load = yes; then
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
+- echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+-if test "${ac_cv_func_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define dlopen innocuous_dlopen
++# The linker used to build libraries.
++LD=$lt_LD_CXX
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char dlopen (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++# A BSD-compatible nm program.
++NM=$lt_NM
+
+-#undef dlopen
++# A symbol stripping program
+STRIP=$lt_STRIP
- # Used to examine libraries when file_magic_cmd begins "file"
- MAGIC_CMD=$MAGIC_CMD
-@@ -15693,7 +16136,7 @@
- libext="$libext"
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+-choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
- # Shared library suffix (normally ".so").
--shrext='$shrext'
+-int
+-main ()
+-{
+-return f != dlopen;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
+
+-ac_cv_func_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-if test $ac_cv_func_dlopen = yes; then
+- lt_cv_dlopen="dlopen"
+-else
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_dl_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Used on cygwin: assembler.
++AS="$AS"
+
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_svld_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
+
+-ac_cv_lib_svld_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-if test $ac_cv_lib_svld_dlopen = yes; then
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
+- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
+
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dld_link ();
+-int
+-main ()
+-{
+-dld_link ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_dld_dld_link=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++# Object file suffix (normally "o").
++objext="$ac_objext"
+
+-ac_cv_lib_dld_dld_link=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+-if test $ac_cv_lib_dld_dld_link = yes; then
+- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
++# Old archive suffix (normally "a").
++libext="$libext"
+
++# Shared library suffix (normally ".so").
+shrext_cmds='$shrext_cmds'
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -15708,7 +16151,7 @@
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-fi
++# Executable file suffix (normally "").
++exeext="$exeext"
--# Must we lock files when doing compilation ?
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+
+-fi
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+-fi
+# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
++need_locks=$lt_need_locks
- # Do we need the lib prefix for modules?
-@@ -15910,7 +16353,10 @@
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+
+-fi
++# Do we need a version for libraries?
++need_version=$need_version
+
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+
+-fi
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+
+- ;;
+- esac
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+
+- if test "x$lt_cv_dlopen" != xno; then
+- enable_dlopen=yes
+- else
+- enable_dlopen=no
+- fi
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+- case $lt_cv_dlopen in
+- dlopen)
+- save_CPPFLAGS="$CPPFLAGS"
+- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+- save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+- save_LIBS="$LIBS"
+- LIBS="$lt_cv_dlopen_libs $LIBS"
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 15412 "configure"
+-#include "confdefs.h"
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++# Library versioning type.
++version_type=$version_type
+
+-#include <stdio.h>
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
++# List of archive names. First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
+
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+- exit (status);
+-}
+-EOF
+- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+- esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self=no
+- fi
+-fi
+-rm -fr conftest*
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
+
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+
+- if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
+- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self_static=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 15510 "configure"
+-#include "confdefs.h"
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
+
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
+
+-#include <stdio.h>
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
+
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+-
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
+-
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
+-
+- exit (status);
+-}
+-EOF
+- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+- esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self_static=no
+- fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+- fi
+-
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+- ;;
+- esac
+-
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
+-
+- case $lt_cv_dlopen_self_static in
+- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+- *) enable_dlopen_self_static=unknown ;;
+- esac
+-fi
+-
+-
+-# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+- # See if we are running on zsh, and set the options which allow our commands through
+- # without removal of \ escapes.
+- if test -n "${ZSH_VERSION+set}" ; then
+- setopt NO_GLOB_SUBST
+- fi
+- # Now quote all the things that may contain metacharacters while being
+- # careful not to overquote the AC_SUBSTed values. We take copies of the
+- # variables and quote the copies for generation of the libtool script.
+- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+- old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+- deplibs_check_method reload_flag reload_cmds need_locks \
+- lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+- lt_cv_sys_global_symbol_to_c_name_address \
+- sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+- old_postinstall_cmds old_postuninstall_cmds \
+- compiler_CXX \
+- CC_CXX \
+- LD_CXX \
+- lt_prog_compiler_wl_CXX \
+- lt_prog_compiler_pic_CXX \
+- lt_prog_compiler_static_CXX \
+- lt_prog_compiler_no_builtin_flag_CXX \
+- export_dynamic_flag_spec_CXX \
+- thread_safe_flag_spec_CXX \
+- whole_archive_flag_spec_CXX \
+- enable_shared_with_static_runtimes_CXX \
+- old_archive_cmds_CXX \
+- old_archive_from_new_cmds_CXX \
+- predep_objects_CXX \
+- postdep_objects_CXX \
+- predeps_CXX \
+- postdeps_CXX \
+- compiler_lib_search_path_CXX \
+- archive_cmds_CXX \
+- archive_expsym_cmds_CXX \
+- postinstall_cmds_CXX \
+- postuninstall_cmds_CXX \
+- old_archive_from_expsyms_cmds_CXX \
+- allow_undefined_flag_CXX \
+- no_undefined_flag_CXX \
+- export_symbols_cmds_CXX \
+- hardcode_libdir_flag_spec_CXX \
+- hardcode_libdir_flag_spec_ld_CXX \
+- hardcode_libdir_separator_CXX \
+- hardcode_automatic_CXX \
+- module_cmds_CXX \
+- module_expsym_cmds_CXX \
+- lt_cv_prog_compiler_c_o_CXX \
+- exclude_expsyms_CXX \
+- include_expsyms_CXX; do
+-
+- case $var in
+- old_archive_cmds_CXX | \
+- old_archive_from_new_cmds_CXX | \
+- archive_cmds_CXX | \
+- archive_expsym_cmds_CXX | \
+- module_cmds_CXX | \
+- module_expsym_cmds_CXX | \
+- old_archive_from_expsyms_cmds_CXX | \
+- export_symbols_cmds_CXX | \
+- extract_expsyms_cmds | reload_cmds | finish_cmds | \
+- postinstall_cmds | postuninstall_cmds | \
+- old_postinstall_cmds | old_postuninstall_cmds | \
+- sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+- # Double-quote double-evaled strings.
+- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+- ;;
+- *)
+- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+- ;;
+- esac
+- done
+-
+- case $lt_echo in
+- *'\$0 --fallback-echo"')
+- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+- ;;
+- esac
+-
+-cfgfile="$ofile"
+-
+- cat <<__EOF__ >> "$cfgfile"
+-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$archive_cmds_need_lc_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
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+-
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# A language-specific compiler.
+-CC=$lt_compiler_CXX
+-
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_CXX
+-
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+-
+-# The linker used to build libraries.
+-LD=$lt_LD_CXX
+-
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+-
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$STRIP
+-
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_CXX
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_CXX
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+-
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
+-
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+-
+-# Do we need a version for libraries?
+-need_version=$need_version
+-
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+-
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+-
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+-
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_CXX
+-
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+-
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+-
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
+-
+-# Library versioning type.
+-version_type=$version_type
+-
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+-
+-# List of archive names. First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+-
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_CXX
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+-
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+-
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_CXX
+-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+-
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_CXX
+-module_expsym_cmds=$lt_module_expsym_cmds_CXX
+-
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_CXX
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_CXX
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_CXX
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_CXX
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
+
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+@@ -16002,7 +15940,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.
@@ -6613,20 +9821,27 @@
fi
-@@ -15986,12 +16432,35 @@
+@@ -16074,16 +16015,42 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
@@ -6650,7 +9865,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -16004,7 +16473,7 @@
+@@ -16096,7 +16063,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -6659,7 +9874,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16012,8 +16481,10 @@
+@@ -16104,8 +16071,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -6672,7 +9887,28 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16090,7 +16561,7 @@
+@@ -16118,8 +16087,6 @@
+ echo "$as_me:$LINENO: result: $enable_static" >&5
+ echo "${ECHO_T}$enable_static" >&6
+
+-test "$ld_shlibs_F77" = no && can_build_shared=no
+-
+ GCC_F77="$G77"
+ LD_F77="$LD"
+
+@@ -16166,6 +16133,11 @@
+ lt_prog_compiler_pic_F77='-fno-common'
+ ;;
+
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+@@ -16182,7 +16154,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6681,7 +9917,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16116,6 +16587,16 @@
+@@ -16208,6 +16180,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -6698,7 +9934,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16127,7 +16608,7 @@
+@@ -16219,7 +16201,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.
@@ -6707,7 +9943,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16151,12 +16632,19 @@
+@@ -16243,12 +16225,19 @@
;;
linux*)
@@ -6728,9 +9964,15 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16177,9 +16665,14 @@
+@@ -16263,15 +16252,15 @@
+ lt_prog_compiler_static_F77='-non_shared'
;;
+- sco3.2v5*)
+- lt_prog_compiler_pic_F77='-Kpic'
+- lt_prog_compiler_static_F77='-dn'
+- ;;
+-
solaris*)
- lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
@@ -6744,10 +9986,25 @@
;;
sunos4*)
-@@ -16201,6 +16694,11 @@
+@@ -16280,7 +16269,7 @@
+ lt_prog_compiler_static_F77='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl_F77='-Wl,'
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -16293,6 +16282,17 @@
fi
;;
++ 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
@@ -6756,7 +10013,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16235,18 +16733,20 @@
+@@ -16327,7 +16327,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -6764,25 +10021,21 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16241: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16739: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:16245: \$? = $ac_status" >&5
-+ echo "$as_me:16743: \$? = $ac_status" >&5
+ (eval echo "\"\$as_me:16333: $lt_compile\"" >&5)
+@@ -16337,8 +16337,10 @@
+ echo "$as_me:16337: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16267,7 +16767,7 @@
+@@ -16359,7 +16361,7 @@
fi
fi
@@ -6791,7 +10044,56 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16289,38 +16789,36 @@
+@@ -16369,6 +16371,48 @@
+ ;;
+ esac
+
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_prog_compiler_static_works_F77=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++ printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works_F77=yes
++ fi
++ else
++ lt_prog_compiler_static_works_F77=yes
++ fi
++ fi
++ $rm conftest*
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
++
++if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++ :
++else
++ lt_prog_compiler_static_F77=
++fi
++
++
+ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+ if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
+@@ -16381,38 +16425,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6812,21 +10114,21 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16308: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16801: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16400: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16437: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16312: \$? = $ac_status" >&5
-+ echo "$as_me:16805: \$? = $ac_status" >&5
+- echo "$as_me:16404: \$? = $ac_status" >&5
++ echo "$as_me:16441: \$? = $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
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_F77=yes
fi
fi
@@ -6842,7 +10144,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16391,6 +16889,16 @@
+@@ -16483,6 +16525,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -6859,7 +10161,18 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16411,6 +16919,27 @@
+@@ -16493,6 +16545,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -16503,6 +16559,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -6887,7 +10200,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16448,7 +16977,7 @@
+@@ -16540,7 +16617,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -6896,7 +10209,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16458,13 +16987,13 @@
+@@ -16550,13 +16627,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'
@@ -6909,22 +10222,37 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# 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
-@@ -16473,19 +17002,51 @@
+@@ -16565,23 +16642,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
- ld_shlibs=no
+ ld_shlibs_F77=no
+ fi
+ ;;
+
++ interix3*)
++ hardcode_direct_F77=no
++ hardcode_shlibpath_var_F77=no
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_F77='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -6970,7 +10298,12 @@
fi
;;
-@@ -16503,8 +17064,8 @@
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs_F77=no
+ cat <<EOF 1>&2
+@@ -16595,13 +16719,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6981,8 +10314,40 @@
else
ld_shlibs_F77=no
fi
-@@ -16519,24 +17080,19 @@
+ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++ ld_shlibs_F77=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ ld_shlibs_F77=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -16611,24 +16762,19 @@
+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -7013,7 +10378,16 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16570,9 +17126,20 @@
+@@ -16640,7 +16786,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L_F77=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct_F77=unsupported
+@@ -16662,9 +16808,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
@@ -7029,6 +10403,7 @@
+ break
+ fi
+ done
++ ;;
+ esac
- # KDE requires run time linking. Make it the default.
@@ -7036,7 +10411,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16589,7 +17156,7 @@
+@@ -16681,7 +16839,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7045,8 +10420,11 @@
# 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`
-@@ -16610,6 +17177,9 @@
+@@ -16700,8 +16858,12 @@
+ hardcode_libdir_flag_spec_F77='-L$libdir'
+ hardcode_libdir_separator_F77=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -7055,16 +10433,19 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16618,21 +17188,22 @@
+@@ -16709,22 +16871,23 @@
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
else
- shared_flag='-qmkshrobj'
+- fi
+ shared_flag='${wl}-bM:SRE'
- fi
++ fi
fi
fi
@@ -7083,7 +10464,7 @@
program main
end
-@@ -16673,14 +17244,13 @@
+@@ -16765,14 +16928,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7091,28 +10472,34 @@
- archive_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
- archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_F77="-z nodefs"
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16734,8 +17304,8 @@
+@@ -16821,13 +16983,11 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_F77=' ${wl}-bernotok'
+ allow_undefined_flag_F77=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols_F77=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_F77=' '
+- whole_archive_flag_spec_F77=' '
++ whole_archive_flag_spec_F77='$convenience'
archive_cmds_need_lc_F77=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -16748,7 +17318,7 @@
+@@ -16840,7 +17000,7 @@
ld_shlibs_F77=no
;;
@@ -7121,7 +10508,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16758,68 +17328,68 @@
+@@ -16850,68 +17010,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -7234,18 +10621,27 @@
fi
;;
-@@ -16853,8 +17423,8 @@
+@@ -16945,16 +17105,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
+ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_F77='-R$libdir'
++ hardcode_direct_F77=yes
++ hardcode_shlibpath_var_F77=no
++ ;;
++
++ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
++ kfreebsd*-gnu)
++ archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16862,7 +17432,7 @@
++ link_all_deplibs_F77=no
+ ;;
hpux9*)
if test "$GCC" = yes; then
@@ -7254,15 +10650,41 @@
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
-@@ -16878,16 +17448,16 @@
+@@ -16968,47 +17137,62 @@
+ export_dynamic_flag_spec_F77='${wl}-E'
+ ;;
- hpux10* | hpux11*)
+- hpux10* | hpux11*)
++ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_F77=:
++
++ hardcode_direct_F77=yes
++ export_dynamic_flag_spec_F77='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ hardcode_minus_L_F77=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
- hppa*64*|ia64*)
-- archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ hppa*64*)
+ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
@@ -7271,21 +10693,52 @@
esac
else
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
- hppa*64*|ia64*)
- archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ hppa*64*)
++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
-@@ -16897,7 +17467,7 @@
+ *)
+- archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_F77=:
++
+ case $host_cpu in
- hppa*64*)
- hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16930,7 +17500,7 @@
+- 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
+-
+- # 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'
+@@ -17022,7 +17206,7 @@
+
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -7293,7 +10746,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'
-@@ -16940,7 +17510,7 @@
+@@ -17032,7 +17216,7 @@
link_all_deplibs_F77=yes
;;
@@ -7302,7 +10755,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
-@@ -16963,7 +17533,8 @@
+@@ -17055,7 +17239,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
@@ -7312,7 +10765,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16973,7 +17544,7 @@
+@@ -17065,7 +17250,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -7321,7 +10774,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16984,14 +17555,14 @@
+@@ -17076,14 +17261,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -7338,7 +10791,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'
-@@ -17003,13 +17574,13 @@
+@@ -17095,13 +17280,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -7354,7 +10807,18 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17028,10 +17599,12 @@
+@@ -17109,21 +17294,15 @@
+ hardcode_libdir_separator_F77=:
+ ;;
+
+- sco3.2v5*)
+- archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var_F77=no
+- export_dynamic_flag_spec_F77='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -7369,7 +10833,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'
-@@ -17040,8 +17613,18 @@
+@@ -17132,8 +17311,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -7390,7 +10854,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17050,7 +17633,7 @@
+@@ -17142,7 +17331,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.
@@ -7399,19 +10863,94 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17110,9 +17693,9 @@
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_F77='${wl}-z ${wl}text'
+@@ -17190,36 +17379,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct_F77=yes
+- hardcode_minus_L_F77=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ no_undefined_flag_F77='${wl}-z,text'
++ archive_cmds_need_lc_F77=no
+ hardcode_shlibpath_var_F77=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+- no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var_F77=no
+ ;;
+
+- sysv5*)
+- no_undefined_flag_F77=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- 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'
+- hardcode_libdir_flag_spec_F77=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ no_undefined_flag_F77='${wl}-z,text'
++ allow_undefined_flag_F77='${wl}-z,nodefs'
++ archive_cmds_need_lc_F77=no
+ hardcode_shlibpath_var_F77=no
++ hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator_F77=':'
++ link_all_deplibs_F77=yes
++ export_dynamic_flag_spec_F77='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_F77=no
-@@ -17218,7 +17801,7 @@
++
++ if test "$GCC" = yes; then
++ archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -17238,11 +17436,6 @@
+ echo "${ECHO_T}$ld_shlibs_F77" >&6
+ test "$ld_shlibs_F77" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -17275,6 +17468,7 @@
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl_F77
++ pic_flag=$lt_prog_compiler_pic_F77
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -17310,7 +17504,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7420,7 +10959,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17228,7 +17811,20 @@
+@@ -17320,7 +17514,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7442,7 +10981,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17293,7 +17889,7 @@
+@@ -17385,7 +17592,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7451,7 +10990,7 @@
;;
beos*)
-@@ -17302,7 +17898,7 @@
+@@ -17394,7 +17601,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7460,7 +10999,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17318,7 +17914,7 @@
+@@ -17410,7 +17617,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7469,7 +11008,7 @@
need_version=no
need_lib_prefix=no
-@@ -17330,7 +17926,8 @@
+@@ -17422,7 +17629,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7479,7 +11018,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17360,7 +17957,7 @@
+@@ -17452,7 +17660,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7488,7 +11027,7 @@
;;
esac
;;
-@@ -17383,7 +17980,7 @@
+@@ -17475,7 +17683,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7497,7 +11036,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"`
-@@ -17406,7 +18003,7 @@
+@@ -17498,7 +17706,7 @@
dynamic_linker=no
;;
@@ -7506,7 +11045,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17418,8 +18015,17 @@
+@@ -17510,8 +17718,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -7526,7 +11065,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17437,7 +18043,7 @@
+@@ -17529,14 +17746,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7535,7 +11074,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17464,9 +18070,9 @@
+- *) # from 3.2 on
++ 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
+ ;;
+
+@@ -17556,9 +17778,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7547,7 +11099,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17481,7 +18087,7 @@
+@@ -17573,7 +17795,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7556,7 +11108,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17492,7 +18098,7 @@
+@@ -17584,7 +17806,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7565,7 +11117,26 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17554,22 +18160,19 @@
+@@ -17596,6 +17818,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -17646,22 +17880,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -7594,7 +11165,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,
-@@ -17579,6 +18182,30 @@
+@@ -17671,6 +17902,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7625,7 +11196,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17588,7 +18215,7 @@
+@@ -17680,7 +17935,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7634,9 +11205,11 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17617,7 +18244,11 @@
+@@ -17708,8 +17963,13 @@
+
openbsd*)
version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
need_lib_prefix=no
- need_version=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@ -7647,7 +11220,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
-@@ -17637,7 +18268,7 @@
+@@ -17729,7 +17989,7 @@
os2*)
libname_spec='$name'
@@ -7656,7 +11229,69 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17739,8 +18370,8 @@
+@@ -17747,13 +18007,6 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -17779,7 +18032,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -17812,6 +18065,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17827,12 +18103,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
+ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -7667,17 +11302,54 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17816,7 +18447,8 @@
+@@ -17864,36 +18145,6 @@
+ enable_fast_install=needless
+ fi
+
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+- case $host_os in
+- darwin*)
+- if test -n "$STRIP" ; then
+- striplib="$STRIP -x"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+- ;;
+- *)
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- ;;
+- esac
+-fi
+-
+-
+
+ # The else clause should only fire when bootstrapping the
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+@@ -17908,7 +18159,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17916,6 +18548,12 @@
+@@ -18008,6 +18260,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7690,7 +11362,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17946,7 +18584,7 @@
+@@ -18019,6 +18277,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_F77
+
+@@ -18038,7 +18299,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7699,7 +11381,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17977,7 +18615,7 @@
+@@ -18069,7 +18330,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7708,7 +11390,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17992,7 +18630,7 @@
+@@ -18084,7 +18345,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -7717,7 +11399,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18194,7 +18832,10 @@
+@@ -18286,7 +18547,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.
@@ -7729,7 +11411,7 @@
fi
-@@ -18227,7 +18868,7 @@
+@@ -18319,26 +18583,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -7738,20 +11420,26 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18238,15 +18879,41 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
@@ -7780,7 +11468,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
-@@ -18273,18 +18940,20 @@
+@@ -18365,18 +18658,20 @@
# 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 \
@@ -7788,25 +11476,37 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18279: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18946: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18371: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18283: \$? = $ac_status" >&5
-+ echo "$as_me:18950: \$? = $ac_status" >&5
+- echo "$as_me:18375: \$? = $ac_status" >&5
++ echo "$as_me:18668: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18361,7 +19030,7 @@
+@@ -18437,6 +18732,11 @@
+ lt_prog_compiler_pic_GCJ='-fno-common'
+ ;;
+
++ interix3*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+@@ -18453,7 +18753,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7815,7 +11515,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18387,6 +19056,16 @@
+@@ -18479,6 +18779,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7832,7 +11532,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18398,7 +19077,7 @@
+@@ -18490,7 +18800,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.
@@ -7841,7 +11541,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18422,12 +19101,19 @@
+@@ -18514,12 +18824,19 @@
;;
linux*)
@@ -7862,9 +11562,15 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18448,9 +19134,14 @@
+@@ -18534,15 +18851,15 @@
+ lt_prog_compiler_static_GCJ='-non_shared'
;;
+- sco3.2v5*)
+- lt_prog_compiler_pic_GCJ='-Kpic'
+- lt_prog_compiler_static_GCJ='-dn'
+- ;;
+-
solaris*)
- lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
@@ -7878,10 +11584,25 @@
;;
sunos4*)
-@@ -18472,6 +19163,11 @@
+@@ -18551,7 +18868,7 @@
+ lt_prog_compiler_static_GCJ='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -18564,6 +18881,17 @@
fi
;;
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ lt_prog_compiler_pic_GCJ='-KPIC'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ ;;
++
+ unicos*)
+ lt_prog_compiler_wl_GCJ='-Wl,'
+ lt_prog_compiler_can_build_shared_GCJ=no
@@ -7890,7 +11611,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18506,18 +19202,20 @@
+@@ -18598,18 +18926,20 @@
# 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 \
@@ -7898,25 +11619,25 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18512: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19208: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18604: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18932: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18516: \$? = $ac_status" >&5
-+ echo "$as_me:19212: \$? = $ac_status" >&5
+- echo "$as_me:18608: \$? = $ac_status" >&5
++ echo "$as_me:18936: \$? = $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
- if test ! -s conftest.err; then
+ # So say no if there are warnings other than the usual output.
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
-+ $SED '/^$/d' conftest.err >conftest.er2
-+ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18538,7 +19236,7 @@
+@@ -18630,7 +18960,7 @@
fi
fi
@@ -7925,7 +11646,56 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18560,38 +19258,36 @@
+@@ -18640,6 +18970,48 @@
+ ;;
+ esac
+
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_prog_compiler_static_works_GCJ=no
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++ printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++ # The linker can only warn and ignore the option if not recognized
++ # So say no if there are warnings
++ if test -s conftest.err; then
++ # Append any errors to the config.log.
++ cat conftest.err 1>&5
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ lt_prog_compiler_static_works_GCJ=yes
++ fi
++ else
++ lt_prog_compiler_static_works_GCJ=yes
++ fi
++ fi
++ $rm conftest*
++ LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
++
++if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++ :
++else
++ lt_prog_compiler_static_GCJ=
++fi
++
++
+ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+ if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
+@@ -18652,38 +19024,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7946,21 +11716,21 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18579: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19270: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18671: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19036: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18583: \$? = $ac_status" >&5
-+ echo "$as_me:19274: \$? = $ac_status" >&5
+- echo "$as_me:18675: \$? = $ac_status" >&5
++ echo "$as_me:19040: \$? = $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
# So say no if there are warnings
- if test ! -s out/conftest.err; then
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
-+ $SED '/^$/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o_GCJ=yes
fi
fi
@@ -7976,7 +11746,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18662,6 +19358,16 @@
+@@ -18754,6 +19124,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7993,7 +11763,18 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18682,6 +19388,27 @@
+@@ -18764,6 +19144,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -18774,6 +19158,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8021,7 +11802,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18719,7 +19446,7 @@
+@@ -18811,7 +19216,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8030,7 +11811,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18729,13 +19456,13 @@
+@@ -18821,13 +19226,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'
@@ -8043,22 +11824,37 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
# 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
-@@ -18744,19 +19471,51 @@
+@@ -18836,23 +19241,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+
++ interix3*)
++ hardcode_direct_GCJ=no
++ hardcode_shlibpath_var_GCJ=no
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_GCJ='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -8104,7 +11900,12 @@
fi
;;
-@@ -18774,8 +19533,8 @@
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs_GCJ=no
+ cat <<EOF 1>&2
+@@ -18866,13 +19318,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8115,8 +11916,40 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18790,24 +19549,19 @@
+ ;;
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
++ ld_shlibs_GCJ=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ ld_shlibs_GCJ=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -18882,24 +19361,19 @@
+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -8147,7 +11980,16 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18841,9 +19595,20 @@
+@@ -18911,7 +19385,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L_GCJ=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct_GCJ=unsupported
+@@ -18933,9 +19407,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
@@ -8163,6 +12005,7 @@
+ break
+ fi
+ done
++ ;;
+ esac
- # KDE requires run time linking. Make it the default.
@@ -8170,7 +12013,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18860,7 +19625,7 @@
+@@ -18952,7 +19438,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8179,8 +12022,11 @@
# 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`
-@@ -18881,6 +19646,9 @@
+@@ -18971,8 +19457,12 @@
+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
+ hardcode_libdir_separator_GCJ=
fi
++ ;;
esac
shared_flag='-shared'
+ if test "$aix_use_runtimelinking" = yes; then
@@ -8189,16 +12035,19 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18889,21 +19657,22 @@
+@@ -18980,22 +19470,23 @@
+ # chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
+- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag='${wl}-G'
else
- shared_flag='-qmkshrobj'
+- fi
+ shared_flag='${wl}-bM:SRE'
- fi
++ fi
fi
fi
@@ -8217,7 +12066,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18954,14 +19723,13 @@
+@@ -19046,14 +19537,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8225,28 +12074,34 @@
- archive_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
allow_undefined_flag_GCJ="-z nodefs"
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19025,8 +19793,8 @@
+@@ -19112,13 +19602,11 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_GCJ=' ${wl}-bernotok'
+ allow_undefined_flag_GCJ=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- always_export_symbols_GCJ=yes
# Exported symbols can be pulled into shared objects from archives
- whole_archive_flag_spec_GCJ=' '
+- whole_archive_flag_spec_GCJ=' '
++ whole_archive_flag_spec_GCJ='$convenience'
archive_cmds_need_lc_GCJ=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ # This is similar to how AIX traditionally builds its shared libraries.
-+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -19039,7 +19807,7 @@
+@@ -19131,7 +19619,7 @@
ld_shlibs_GCJ=no
;;
@@ -8255,7 +12110,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19049,68 +19817,68 @@
+@@ -19141,68 +19629,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -8368,19 +12223,28 @@
fi
;;
-@@ -19144,8 +19912,8 @@
+@@ -19236,16 +19724,25 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
- archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu | dragonfly*)
++ freebsd* | dragonfly*)
+ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19153,7 +19921,7 @@
+ ;;
++ # GNU/kFreeBSD uses gcc -shared to do shared libraries.
++ kfreebsd*-gnu)
++ archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_GCJ='-R$libdir'
++ hardcode_direct_GCJ=yes
++ hardcode_shlibpath_var_GCJ=no
++ link_all_deplibs_GCJ=no
++ ;;
++
hpux9*)
if test "$GCC" = yes; then
- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -8388,15 +12252,41 @@
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
-@@ -19169,16 +19937,16 @@
+@@ -19259,47 +19756,62 @@
+ export_dynamic_flag_spec_GCJ='${wl}-E'
+ ;;
- hpux10* | hpux11*)
+- hpux10* | hpux11*)
++ hpux10*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_GCJ=:
++
++ hardcode_direct_GCJ=yes
++ export_dynamic_flag_spec_GCJ='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ hardcode_minus_L_GCJ=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
- hppa*64*|ia64*)
-- archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ hppa*64*)
+ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
@@ -8405,21 +12295,52 @@
esac
else
- case "$host_cpu" in
+- hppa*64*|ia64*)
+- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ case $host_cpu in
- hppa*64*|ia64*)
- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ hppa*64*)
++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
-@@ -19188,7 +19956,7 @@
+ *)
+- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
esac
fi
if test "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- hppa*64*)
+- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator_GCJ=:
++
+ case $host_cpu in
- hppa*64*)
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++ hppa*64*|ia64*)
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19221,7 +19989,7 @@
+- hardcode_libdir_separator_GCJ=:
+- hardcode_direct_GCJ=no
+- hardcode_shlibpath_var_GCJ=no
+- ;;
+- ia64*)
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- hardcode_minus_L_GCJ=yes
+ ;;
+ *)
+- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
+- hardcode_libdir_separator_GCJ=:
+ hardcode_direct_GCJ=yes
+ export_dynamic_flag_spec_GCJ='${wl}-E'
+@@ -19313,7 +19825,7 @@
+
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -8427,7 +12348,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'
-@@ -19231,7 +19999,7 @@
+@@ -19323,7 +19835,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -8436,7 +12357,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
-@@ -19254,7 +20022,8 @@
+@@ -19346,7 +19858,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
@@ -8446,7 +12367,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19264,7 +20033,7 @@
+@@ -19356,7 +19869,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -8455,7 +12376,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19275,14 +20044,14 @@
+@@ -19367,14 +19880,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -8472,7 +12393,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'
-@@ -19294,13 +20063,13 @@
+@@ -19386,13 +19899,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -8488,7 +12409,18 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19319,10 +20088,12 @@
+@@ -19400,21 +19913,15 @@
+ hardcode_libdir_separator_GCJ=:
+ ;;
+
+- sco3.2v5*)
+- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var_GCJ=no
+- export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -8503,7 +12435,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'
-@@ -19331,8 +20102,18 @@
+@@ -19423,8 +19930,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8524,7 +12456,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19341,7 +20122,7 @@
+@@ -19433,7 +19950,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.
@@ -8533,19 +12465,94 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19401,9 +20182,9 @@
- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
- no_undefined_flag_GCJ='${wl}-z ${wl}text'
+@@ -19481,36 +19998,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct_GCJ=yes
+- hardcode_minus_L_GCJ=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ no_undefined_flag_GCJ='${wl}-z,text'
++ archive_cmds_need_lc_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
+- no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
-+ archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- sysv5*)
+- no_undefined_flag_GCJ=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- 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'
+- hardcode_libdir_flag_spec_GCJ=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ no_undefined_flag_GCJ='${wl}-z,text'
++ allow_undefined_flag_GCJ='${wl}-z,nodefs'
++ archive_cmds_need_lc_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
++ hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ hardcode_libdir_separator_GCJ=':'
++ link_all_deplibs_GCJ=yes
++ export_dynamic_flag_spec_GCJ='${wl}-Bexport'
runpath_var='LD_RUN_PATH'
- hardcode_shlibpath_var_GCJ=no
-@@ -19509,7 +20290,7 @@
++
++ if test "$GCC" = yes; then
++ archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -19529,11 +20055,6 @@
+ echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+ test "$ld_shlibs_GCJ" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -19566,6 +20087,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=
+@@ -19601,7 +20123,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8554,7 +12561,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19519,7 +20300,20 @@
+@@ -19611,7 +20133,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8576,7 +12583,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19584,7 +20378,7 @@
+@@ -19676,7 +20211,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8585,7 +12592,7 @@
;;
beos*)
-@@ -19593,7 +20387,7 @@
+@@ -19685,7 +20220,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8594,7 +12601,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19609,7 +20403,7 @@
+@@ -19701,7 +20236,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8603,7 +12610,7 @@
need_version=no
need_lib_prefix=no
-@@ -19621,7 +20415,8 @@
+@@ -19713,7 +20248,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8613,7 +12620,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19651,7 +20446,7 @@
+@@ -19743,7 +20279,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8622,7 +12629,7 @@
;;
esac
;;
-@@ -19674,7 +20469,7 @@
+@@ -19766,7 +20302,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8631,7 +12638,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"`
-@@ -19697,7 +20492,7 @@
+@@ -19789,7 +20325,7 @@
dynamic_linker=no
;;
@@ -8640,7 +12647,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19709,8 +20504,17 @@
+@@ -19801,8 +20337,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8660,7 +12667,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19728,7 +20532,7 @@
+@@ -19820,14 +20365,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8669,7 +12676,20 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19755,9 +20559,9 @@
+- *) # from 3.2 on
++ 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
+ ;;
+
+@@ -19847,9 +20397,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8681,7 +12701,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19772,7 +20576,7 @@
+@@ -19864,7 +20414,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8690,7 +12710,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19783,7 +20587,7 @@
+@@ -19875,1112 +20425,343 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8699,10 +12719,64 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19845,22 +20649,19 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- ;;
+- esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+- postinstall_cmds='chmod 555 $lib'
+- ;;
+-
+-irix5* | irix6* | nonstopux*)
+- case $host_os in
+- nonstopux*) version_type=nonstopux ;;
+- *)
+- if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
+- else
+- version_type=irix
+- fi ;;
+- esac
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+- case $host_os in
+- irix5* | nonstopux*)
+- libsuff= shlibsuff=
+- ;;
+- *)
+- case $LD in # libtool.m4 will add one of these switches to LD
+- *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+- libsuff= shlibsuff= libmagic=32-bit;;
+- *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+- libsuff=32 shlibsuff=N32 libmagic=N32;;
+- *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+- libsuff=64 shlibsuff=64 libmagic=64-bit;;
+- *) libsuff= shlibsuff= libmagic=never-match;;
+- esac
+- ;;
+- esac
+- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+- hardcode_into_libs=yes
+- ;;
+-
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+- dynamic_linker=no
+- ;;
+-
+-# This must be Linux ELF.
+-linux*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
@@ -8710,28 +12784,891 @@
- libsuff=64
- fi
- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+-
+- # We used to test for /lib/ld.so.1 and disable shared libraries on
+- # powerpc, because MkLinux only supported shared libraries with the
+- # GNU dynamic linker. Since this was broken with cross compilers,
+- # most powerpc-linux boxes support dynamic linking these days and
+- # people can always --disable-shared, the test was removed, and we
+- # assume the GNU/Linux dynamic linker is in use.
+- dynamic_linker='GNU/Linux ld.so'
+- ;;
+-
+-netbsd*)
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- dynamic_linker='NetBSD (a.out) ld.so'
+- else
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- dynamic_linker='NetBSD ld.elf_so'
+- fi
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- ;;
+-
+-newsos6)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-nto-qnx*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- ;;
+-
+-openbsd*)
+- version_type=sunos
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- case $host_os in
+- openbsd2.[89] | openbsd2.[89].*)
+- shlibpath_overrides_runpath=no
+- ;;
+- *)
+- shlibpath_overrides_runpath=yes
+- ;;
+- esac
+- else
+- shlibpath_overrides_runpath=yes
+- fi
+- ;;
+-
+-os2*)
+- libname_spec='$name'
+- shrext=".dll"
+- need_lib_prefix=no
+- library_names_spec='$libname${shared_ext} $libname.a'
+- dynamic_linker='OS/2 ld.exe'
+- shlibpath_var=LIBPATH
+- ;;
+-
+-osf3* | osf4* | osf5*)
+- version_type=osf
+- need_lib_prefix=no
+- need_version=no
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+- ;;
+-
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-solaris*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+- # ldd complains unless libraries are executable
+- postinstall_cmds='chmod +x $lib'
+- ;;
+-
+-sunos4*)
+- version_type=sunos
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+- finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- if test "$with_gnu_ld" = yes; then
+- need_lib_prefix=no
+- fi
+- need_version=yes
+- ;;
+-
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_vendor in
+- sni)
+- shlibpath_overrides_runpath=no
+- need_lib_prefix=no
+- export_dynamic_flag_spec='${wl}-Blargedynsym'
+- runpath_var=LD_RUN_PATH
+- ;;
+- siemens)
+- need_lib_prefix=no
+- ;;
+- motorola)
+- need_lib_prefix=no
+- need_version=no
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+- ;;
+- esac
+- ;;
+-
+-sysv4*MP*)
+- if test -d /usr/nec ;then
+- version_type=linux
+- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+- soname_spec='$libname${shared_ext}.$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- fi
+- ;;
+-
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
+-*)
+- dynamic_linker=no
+- ;;
+-esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
+-test "$dynamic_linker" = no && can_build_shared=no
+-
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-hardcode_action_GCJ=
+-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+- test -n "$runpath_var GCJ" || \
+- test "X$hardcode_automatic_GCJ"="Xyes" ; then
+-
+- # We can hardcode non-existant directories.
+- if test "$hardcode_direct_GCJ" != no &&
+- # If the only mechanism to avoid hardcoding is shlibpath_var, we
+- # have to relink, otherwise we might link with an installed library
+- # when we should be linking with a yet-to-be-installed one
+- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+- test "$hardcode_minus_L_GCJ" != no; then
+- # Linking always hardcodes the temporary library directory.
+- hardcode_action_GCJ=relink
+- else
+- # We can link without hardcoding, and we can hardcode nonexisting dirs.
+- hardcode_action_GCJ=immediate
+- fi
+-else
+- # We cannot hardcode anything, or else we can only hardcode existing
+- # directories.
+- hardcode_action_GCJ=unsupported
+-fi
+-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+-echo "${ECHO_T}$hardcode_action_GCJ" >&6
+-
+-if test "$hardcode_action_GCJ" = relink; then
+- # Fast installation is not supported
+- enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+- test "$enable_shared" = no; then
+- # Fast installation is not necessary
+- enable_fast_install=needless
+-fi
+-
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+- case $host_os in
+- darwin*)
+- if test -n "$STRIP" ; then
+- striplib="$STRIP -x"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+- ;;
+- *)
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- ;;
+- esac
+-fi
+-
+-if test "x$enable_dlopen" != xyes; then
+- enable_dlopen=unknown
+- enable_dlopen_self=unknown
+- enable_dlopen_self_static=unknown
+-else
+- lt_cv_dlopen=no
+- lt_cv_dlopen_libs=
+-
+- case $host_os in
+- beos*)
+- lt_cv_dlopen="load_add_on"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+- ;;
+-
+- mingw* | pw32*)
+- lt_cv_dlopen="LoadLibrary"
+- lt_cv_dlopen_libs=
+- ;;
+-
+- cygwin*)
+- lt_cv_dlopen="dlopen"
+- lt_cv_dlopen_libs=
+- ;;
+-
+- darwin*)
+- # if libdl is installed we need to link against it
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_dl_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-
+- lt_cv_dlopen="dyld"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+-
+-fi
+-
+- ;;
+-
+- *)
+- echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+-if test "${ac_cv_func_shl_load+set}" = set; then
+- 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 shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shl_load (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
+-choke me
+-#else
+-char (*f) () = shl_load;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != shl_load;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_shl_load=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-if test $ac_cv_func_shl_load = yes; then
+- lt_cv_dlopen="shl_load"
+-else
+- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char shl_load ();
+-int
+-main ()
+-{
+-shl_load ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_dld_shl_load=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dld_shl_load=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-if test $ac_cv_lib_dld_shl_load = yes; then
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+-else
+- echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+-if test "${ac_cv_func_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define dlopen innocuous_dlopen
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char dlopen (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef dlopen
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-{
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
+-choke me
+-#else
+-char (*f) () = dlopen;
+-#endif
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-int
+-main ()
+-{
+-return f != dlopen;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_func_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_func_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-if test $ac_cv_func_dlopen = yes; then
+- lt_cv_dlopen="dlopen"
+-else
+- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_dl_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_dl_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-if test $ac_cv_lib_dl_dlopen = yes; then
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dlopen ();
+-int
+-main ()
+-{
+-dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_svld_dlopen=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_svld_dlopen=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-if test $ac_cv_lib_svld_dlopen = yes; then
+- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+-else
+- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char dld_link ();
+-int
+-main ()
+-{
+-dld_link ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_dld_dld_link=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ 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'
++ ;;
+-ac_cv_lib_dld_dld_link=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+-if test $ac_cv_lib_dld_dld_link = yes; then
+- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-fi
++interix3*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
+
++irix5* | irix6* | nonstopux*)
++ case $host_os in
++ nonstopux*) version_type=nonstopux ;;
++ *)
++ 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
++ ;;
+
+-fi
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++ dynamic_linker=no
++ ;;
+
++# This must be Linux ELF.
++linux*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ # This implies no fast_install, which is unacceptable.
++ # Some rework will be needed to allow for fast_install
++ # before this can be enabled.
++ hardcode_into_libs=yes
+
+-fi
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
-+
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
-@@ -19870,6 +20671,30 @@
- dynamic_linker='GNU/Linux ld.so'
- ;;
++ # We used to test for /lib/ld.so.1 and disable shared libraries on
++ # powerpc, because MkLinux only supported shared libraries with the
++ # GNU dynamic linker. Since this was broken with cross compilers,
++ # most powerpc-linux boxes support dynamic linking these days and
++ # people can always --disable-shared, the test was removed, and we
++ # assume the GNU/Linux dynamic linker is in use.
++ dynamic_linker='GNU/Linux ld.so'
++ ;;
+
+-fi
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -8743,7 +13680,7 @@
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
-+
+
+knetbsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -8755,99 +13692,450 @@
+ hardcode_into_libs=yes
+ dynamic_linker='GNU ld.so'
+ ;;
-+
- netbsd*)
- version_type=sunos
- need_lib_prefix=no
-@@ -19879,7 +20704,7 @@
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
- else
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
+
+-fi
++netbsd*)
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ dynamic_linker='NetBSD (a.out) ld.so'
++ else
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
- fi
-@@ -19908,7 +20733,11 @@
- openbsd*)
- version_type=sunos
- need_lib_prefix=no
-- need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='NetBSD ld.elf_so'
++ fi
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+
++newsos6)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
+-fi
++nto-qnx*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ ;;
+
+- ;;
++openbsd*)
++ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
++ need_lib_prefix=no
+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+ *) need_version=no ;;
+ esac
+-
+- if test "x$lt_cv_dlopen" != xno; then
+- enable_dlopen=yes
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ case $host_os in
++ openbsd2.[89] | openbsd2.[89].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
+ else
+- enable_dlopen=no
++ shlibpath_overrides_runpath=yes
+ fi
++ ;;
+
+- case $lt_cv_dlopen in
+- dlopen)
+- save_CPPFLAGS="$CPPFLAGS"
+- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+- save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+- save_LIBS="$LIBS"
+- LIBS="$lt_cv_dlopen_libs $LIBS"
+-
+- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 20785 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
++os2*)
++ libname_spec='$name'
++ shrext_cmds=".dll"
++ need_lib_prefix=no
++ library_names_spec='$libname${shared_ext} $libname.a'
++ dynamic_linker='OS/2 ld.exe'
++ shlibpath_var=LIBPATH
++ ;;
+
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
++osf3* | osf4* | osf5*)
++ version_type=osf
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++ ;;
+
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
++solaris*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ # ldd complains unless libraries are executable
++ postinstall_cmds='chmod +x $lib'
++ ;;
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++sunos4*)
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ if test "$with_gnu_ld" = yes; then
++ need_lib_prefix=no
++ fi
++ need_version=yes
++ ;;
+
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
++sysv4 | sysv4.3*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ case $host_vendor in
++ sni)
++ shlibpath_overrides_runpath=no
++ need_lib_prefix=no
++ export_dynamic_flag_spec='${wl}-Blargedynsym'
++ runpath_var=LD_RUN_PATH
++ ;;
++ siemens)
++ need_lib_prefix=no
++ ;;
++ motorola)
++ need_lib_prefix=no
++ need_version=no
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
+ esac
- 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
-@@ -19928,7 +20757,7 @@
++ ;;
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -20030,8 +20859,8 @@
- echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
- hardcode_action_GCJ=
- if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-- test -n "$runpath_var GCJ" || \
-- test "X$hardcode_automatic_GCJ"="Xyes" ; then
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
++sysv4*MP*)
++ if test -d /usr/nec ;then
++ version_type=linux
++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++ soname_spec='$libname${shared_ext}.$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ fi
++ ;;
+
+- exit (status);
+-}
+-EOF
+- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
+ esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self=no
+ fi
+-fi
+-rm -fr conftest*
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-
+- if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
+- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then :
+- lt_cv_dlopen_self_static=cross
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-#line 20883 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
+
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
+
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
++*)
++ dynamic_linker=no
++ ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
+
+- exit (status);
+-}
+-EOF
+- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
+- lt_status=$?
+- case x$lt_status in
+- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+- x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+- esac
+- else :
+- # compilation failed
+- lt_cv_dlopen_self_static=no
+- fi
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+-rm -fr conftest*
+
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_GCJ=
++if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ test -n "$runpath_var_GCJ" || \
+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
-@@ -20690,7 +21519,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20693 "configure"
-+#line 21522 "configure"
- #include "confdefs.h"
++ # We can hardcode non-existant directories.
++ if test "$hardcode_direct_GCJ" != no &&
++ # If the only mechanism to avoid hardcoding is shlibpath_var, we
++ # have to relink, otherwise we might link with an installed library
++ # when we should be linking with a yet-to-be-installed one
++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
++ test "$hardcode_minus_L_GCJ" != no; then
++ # Linking always hardcodes the temporary library directory.
++ hardcode_action_GCJ=relink
++ else
++ # We can link without hardcoding, and we can hardcode nonexisting dirs.
++ hardcode_action_GCJ=immediate
++ fi
++else
++ # We cannot hardcode anything, or else we can only hardcode existing
++ # directories.
++ hardcode_action_GCJ=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+- fi
+-
+- CPPFLAGS="$save_CPPFLAGS"
+- LDFLAGS="$save_LDFLAGS"
+- LIBS="$save_LIBS"
+- ;;
+- esac
+-
+- case $lt_cv_dlopen_self in
+- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+- *) enable_dlopen_self=unknown ;;
+- esac
++echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6
- #if HAVE_DLFCN_H
-@@ -20756,7 +21585,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20788,7 +21617,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20791 "configure"
-+#line 21620 "configure"
- #include "confdefs.h"
+- case $lt_cv_dlopen_self_static in
+- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+- *) enable_dlopen_self_static=unknown ;;
+- esac
++if test "$hardcode_action_GCJ" = relink; then
++ # Fast installation is not supported
++ enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
++ # Fast installation is not necessary
++ enable_fast_install=needless
+ fi
- #if HAVE_DLFCN_H
-@@ -20854,7 +21683,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-- (./conftest; exit; ) 2>/dev/null
-+ (./conftest; exit; ) >&5 2>/dev/null
- lt_status=$?
- case x$lt_status in
- x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20905,7 +21734,8 @@
+
+@@ -20997,7 +20778,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21005,6 +21835,12 @@
+@@ -21097,6 +20879,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8860,7 +14148,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21035,7 +21871,7 @@
+@@ -21108,6 +20896,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_GCJ
+
+@@ -21127,7 +20918,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8869,7 +14167,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21066,7 +21902,7 @@
+@@ -21158,7 +20949,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8878,7 +14176,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21081,7 +21917,7 @@
+@@ -21173,7 +20964,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -8887,7 +14185,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21283,7 +22119,10 @@
+@@ -21375,7 +21166,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.
@@ -8899,20 +14197,27 @@
fi
-@@ -21326,11 +22165,35 @@
+@@ -21414,15 +21208,42 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
compiler=$CC
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
@@ -8935,17 +14240,17 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21346,7 +22209,8 @@
+@@ -21438,7 +21259,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
+ SED SHELL STRIP \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21446,6 +22310,12 @@
+@@ -21538,6 +21360,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8958,7 +14263,17 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21476,7 +22346,7 @@
+@@ -21549,6 +21377,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_compiler_RC
+
+@@ -21568,7 +21399,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8967,7 +14282,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21507,7 +22377,7 @@
+@@ -21599,7 +21430,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8976,7 +14291,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21522,7 +22392,7 @@
+@@ -21614,7 +21445,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -8985,7 +14300,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21724,7 +22594,10 @@
+@@ -21816,7 +21647,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.
@@ -8997,7 +14312,7 @@
fi
-@@ -21771,7 +22644,7 @@
+@@ -21863,7 +21697,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9006,7 +14321,7 @@
# Prevent multiple expansion
-@@ -22170,9 +23043,6 @@
+@@ -22262,9 +22096,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9016,7 +14331,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22389,9 +23259,6 @@
+@@ -22481,9 +22312,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9026,7 +14341,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24572,9 +25439,6 @@
+@@ -24664,9 +24492,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9036,79 +14351,79 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29464,7 +30328,7 @@
+@@ -29556,7 +29381,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29467: $i/$j" >&5
-+ echo "configure: 30331: $i/$j" >&5
+- echo "configure: 29559: $i/$j" >&5
++ echo "configure: 29384: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29762,7 +30626,7 @@
+@@ -29854,7 +29679,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29765: $i/$j" >&5
-+ echo "configure: 30629: $i/$j" >&5
+- echo "configure: 29857: $i/$j" >&5
++ echo "configure: 29682: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30598,7 +31462,7 @@
+@@ -30690,7 +30515,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30601: $i/$j" >&5
-+ echo "configure: 31465: $i/$j" >&5
+- echo "configure: 30693: $i/$j" >&5
++ echo "configure: 30518: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30628,7 +31492,7 @@
+@@ -30720,7 +30545,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30631: $i/$j" >&5
-+ echo "configure: 31495: $i/$j" >&5
+- echo "configure: 30723: $i/$j" >&5
++ echo "configure: 30548: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30646,7 +31510,7 @@
+@@ -30738,7 +30563,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30649: $i/$j" >&5
-+ echo "configure: 31513: $i/$j" >&5
+- echo "configure: 30741: $i/$j" >&5
++ echo "configure: 30566: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32169,7 +33033,7 @@
+@@ -32261,7 +32086,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32172: $i/$j" >&5
-+ echo "configure: 33036: $i/$j" >&5
+- echo "configure: 32264: $i/$j" >&5
++ echo "configure: 32089: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32771,7 +33635,7 @@
+@@ -32863,7 +32688,7 @@
do
for j in qsql.html;
do
-- echo "configure: 32774: $i/$j" >&5
-+ echo "configure: 33638: $i/$j" >&5
+- echo "configure: 32866: $i/$j" >&5
++ echo "configure: 32691: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -33920,7 +34784,7 @@
+@@ -34074,7 +33899,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 33923: $i/$j" >&5
-+ echo "configure: 34787: $i/$j" >&5
+- echo "configure: 34077: $i/$j" >&5
++ echo "configure: 33902: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -34372,7 +35236,8 @@
+@@ -34528,7 +34353,8 @@
vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test -n "$vers" && test "$vers" -ge 1009
then
@@ -9118,718 +14433,754 @@
LIBWV2_RPATH=
for args in $LIBWV2_LIBS; do
case $args in
-@@ -37200,7 +38065,7 @@
+@@ -37068,7 +36894,7 @@
do
+ for j in mysql/mysql.h;
+ do
+- echo "configure: 37071: $i/$j" >&5
++ echo "configure: 36897: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ mysql_incdir=$i
+@@ -37097,7 +36923,7 @@
+ do
+ for j in mysql/libmysqlclient.so;
+ do
+- echo "configure: 37100: $i/$j" >&5
++ echo "configure: 36926: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ mysql_libdir=$i
+@@ -37265,7 +37091,7 @@
+ do
+ for j in libpq-fe.h;
+ do
+- echo "configure: 37268: $i/$j" >&5
++ echo "configure: 37094: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ pgsql_incdir=$i
+@@ -37294,7 +37120,7 @@
+ do
+ for j in libpq.so;
+ do
+- echo "configure: 37297: $i/$j" >&5
++ echo "configure: 37123: $i/$j" >&5
+ if test -r "$i/$j"; then
+ echo "taking that" >&5
+ pgsql_libdir=$i
+@@ -37445,7 +37271,7 @@
+ do
for j in pqxx/pqxx;
do
-- echo "configure: 37203: $i/$j" >&5
-+ echo "configure: 38068: $i/$j" >&5
+- echo "configure: 37448: $i/$j" >&5
++ echo "configure: 37274: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
pqxx_incdir=$i
-@@ -37231,7 +38096,7 @@
+@@ -37476,7 +37302,7 @@
do
for j in libpqxx.so;
do
-- echo "configure: 37234: $i/$j" >&5
-+ echo "configure: 38099: $i/$j" >&5
+- echo "configure: 37479: $i/$j" >&5
++ echo "configure: 37305: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
pqxx_libdir=$i
-@@ -37282,7 +38147,7 @@
+@@ -37527,7 +37353,7 @@
do
for j in knewstuff/downloaddialog.h;
do
-- echo "configure: 37285: $i/$j" >&5
-+ echo "configure: 38150: $i/$j" >&5
+- echo "configure: 37530: $i/$j" >&5
++ echo "configure: 37356: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
knewstuff_incdir=$i
-@@ -37299,7 +38164,7 @@
+@@ -37544,7 +37370,7 @@
do
for j in libknewstuff.so;
do
-- echo "configure: 37302: $i/$j" >&5
-+ echo "configure: 38167: $i/$j" >&5
+- echo "configure: 37547: $i/$j" >&5
++ echo "configure: 37373: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
knewstuff_libdir=$i
-@@ -37378,7 +38243,7 @@
+@@ -37623,7 +37449,7 @@
do
for j in kfeedbackwizard.h;
do
-- echo "configure: 37381: $i/$j" >&5
-+ echo "configure: 38246: $i/$j" >&5
+- echo "configure: 37626: $i/$j" >&5
++ echo "configure: 37452: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kfeedback_incdir=$i
-@@ -37395,7 +38260,7 @@
+@@ -37640,7 +37466,7 @@
do
for j in libkfeedbackwizard.so;
do
-- echo "configure: 37398: $i/$j" >&5
-+ echo "configure: 38263: $i/$j" >&5
+- echo "configure: 37643: $i/$j" >&5
++ echo "configure: 37469: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kfeedback_libdir=$i
-@@ -37543,7 +38408,7 @@
+@@ -37788,7 +37614,7 @@
do
for j in Python.h;
do
-- echo "configure: 37546: $i/$j" >&5
-+ echo "configure: 38411: $i/$j" >&5
+- echo "configure: 37791: $i/$j" >&5
++ echo "configure: 37617: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37559,7 +38424,7 @@
+@@ -37804,7 +37630,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37562: $i/$j" >&5
-+ echo "configure: 38427: $i/$j" >&5
+- echo "configure: 37807: $i/$j" >&5
++ echo "configure: 37633: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37583,7 +38448,7 @@
+@@ -37828,7 +37654,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37586: $i/$j" >&5
-+ echo "configure: 38451: $i/$j" >&5
+- echo "configure: 37831: $i/$j" >&5
++ echo "configure: 37657: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37599,7 +38464,7 @@
+@@ -37844,7 +37670,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37602: $i/$j" >&5
-+ echo "configure: 38467: $i/$j" >&5
+- echo "configure: 37847: $i/$j" >&5
++ echo "configure: 37673: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37615,7 +38480,7 @@
+@@ -37860,7 +37686,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 37618: $i/$j" >&5
-+ echo "configure: 38483: $i/$j" >&5
+- echo "configure: 37863: $i/$j" >&5
++ echo "configure: 37689: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37643,7 +38508,7 @@
+@@ -37888,7 +37714,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 37646: $i/$j" >&5
-+ echo "configure: 38511: $i/$j" >&5
+- echo "configure: 37891: $i/$j" >&5
++ echo "configure: 37717: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -37687,7 +38552,7 @@
+@@ -37932,7 +37758,7 @@
do
for j in Python.h;
do
-- echo "configure: 37690: $i/$j" >&5
-+ echo "configure: 38555: $i/$j" >&5
+- echo "configure: 37935: $i/$j" >&5
++ echo "configure: 37761: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37703,7 +38568,7 @@
+@@ -37948,7 +37774,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37706: $i/$j" >&5
-+ echo "configure: 38571: $i/$j" >&5
+- echo "configure: 37951: $i/$j" >&5
++ echo "configure: 37777: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37727,7 +38592,7 @@
+@@ -37972,7 +37798,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37730: $i/$j" >&5
-+ echo "configure: 38595: $i/$j" >&5
+- echo "configure: 37975: $i/$j" >&5
++ echo "configure: 37801: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37743,7 +38608,7 @@
+@@ -37988,7 +37814,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37746: $i/$j" >&5
-+ echo "configure: 38611: $i/$j" >&5
+- echo "configure: 37991: $i/$j" >&5
++ echo "configure: 37817: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37759,7 +38624,7 @@
+@@ -38004,7 +37830,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 37762: $i/$j" >&5
-+ echo "configure: 38627: $i/$j" >&5
+- echo "configure: 38007: $i/$j" >&5
++ echo "configure: 37833: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37787,7 +38652,7 @@
+@@ -38032,7 +37858,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 37790: $i/$j" >&5
-+ echo "configure: 38655: $i/$j" >&5
+- echo "configure: 38035: $i/$j" >&5
++ echo "configure: 37861: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -37831,7 +38696,7 @@
+@@ -38076,7 +37902,7 @@
do
for j in Python.h;
do
-- echo "configure: 37834: $i/$j" >&5
-+ echo "configure: 38699: $i/$j" >&5
+- echo "configure: 38079: $i/$j" >&5
++ echo "configure: 37905: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37847,7 +38712,7 @@
+@@ -38092,7 +37918,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37850: $i/$j" >&5
-+ echo "configure: 38715: $i/$j" >&5
+- echo "configure: 38095: $i/$j" >&5
++ echo "configure: 37921: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37871,7 +38736,7 @@
+@@ -38116,7 +37942,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 37874: $i/$j" >&5
-+ echo "configure: 38739: $i/$j" >&5
+- echo "configure: 38119: $i/$j" >&5
++ echo "configure: 37945: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37887,7 +38752,7 @@
+@@ -38132,7 +37958,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 37890: $i/$j" >&5
-+ echo "configure: 38755: $i/$j" >&5
+- echo "configure: 38135: $i/$j" >&5
++ echo "configure: 37961: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37903,7 +38768,7 @@
+@@ -38148,7 +37974,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 37906: $i/$j" >&5
-+ echo "configure: 38771: $i/$j" >&5
+- echo "configure: 38151: $i/$j" >&5
++ echo "configure: 37977: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -37931,7 +38796,7 @@
+@@ -38176,7 +38002,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 37934: $i/$j" >&5
-+ echo "configure: 38799: $i/$j" >&5
+- echo "configure: 38179: $i/$j" >&5
++ echo "configure: 38005: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -37975,7 +38840,7 @@
+@@ -38220,7 +38046,7 @@
do
for j in Python.h;
do
-- echo "configure: 37978: $i/$j" >&5
-+ echo "configure: 38843: $i/$j" >&5
+- echo "configure: 38223: $i/$j" >&5
++ echo "configure: 38049: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -37991,7 +38856,7 @@
+@@ -38236,7 +38062,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 37994: $i/$j" >&5
-+ echo "configure: 38859: $i/$j" >&5
+- echo "configure: 38239: $i/$j" >&5
++ echo "configure: 38065: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38015,7 +38880,7 @@
+@@ -38260,7 +38086,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38018: $i/$j" >&5
-+ echo "configure: 38883: $i/$j" >&5
+- echo "configure: 38263: $i/$j" >&5
++ echo "configure: 38089: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38031,7 +38896,7 @@
+@@ -38276,7 +38102,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38034: $i/$j" >&5
-+ echo "configure: 38899: $i/$j" >&5
+- echo "configure: 38279: $i/$j" >&5
++ echo "configure: 38105: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38047,7 +38912,7 @@
+@@ -38292,7 +38118,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38050: $i/$j" >&5
-+ echo "configure: 38915: $i/$j" >&5
+- echo "configure: 38295: $i/$j" >&5
++ echo "configure: 38121: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38075,7 +38940,7 @@
+@@ -38320,7 +38146,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38078: $i/$j" >&5
-+ echo "configure: 38943: $i/$j" >&5
+- echo "configure: 38323: $i/$j" >&5
++ echo "configure: 38149: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38119,7 +38984,7 @@
+@@ -38364,7 +38190,7 @@
do
for j in Python.h;
do
-- echo "configure: 38122: $i/$j" >&5
-+ echo "configure: 38987: $i/$j" >&5
+- echo "configure: 38367: $i/$j" >&5
++ echo "configure: 38193: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38135,7 +39000,7 @@
+@@ -38380,7 +38206,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38138: $i/$j" >&5
-+ echo "configure: 39003: $i/$j" >&5
+- echo "configure: 38383: $i/$j" >&5
++ echo "configure: 38209: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38159,7 +39024,7 @@
+@@ -38404,7 +38230,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38162: $i/$j" >&5
-+ echo "configure: 39027: $i/$j" >&5
+- echo "configure: 38407: $i/$j" >&5
++ echo "configure: 38233: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38175,7 +39040,7 @@
+@@ -38420,7 +38246,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38178: $i/$j" >&5
-+ echo "configure: 39043: $i/$j" >&5
+- echo "configure: 38423: $i/$j" >&5
++ echo "configure: 38249: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38191,7 +39056,7 @@
+@@ -38436,7 +38262,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38194: $i/$j" >&5
-+ echo "configure: 39059: $i/$j" >&5
+- echo "configure: 38439: $i/$j" >&5
++ echo "configure: 38265: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38219,7 +39084,7 @@
+@@ -38464,7 +38290,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38222: $i/$j" >&5
-+ echo "configure: 39087: $i/$j" >&5
+- echo "configure: 38467: $i/$j" >&5
++ echo "configure: 38293: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -38263,7 +39128,7 @@
+@@ -38508,7 +38334,7 @@
do
for j in Python.h;
do
-- echo "configure: 38266: $i/$j" >&5
-+ echo "configure: 39131: $i/$j" >&5
+- echo "configure: 38511: $i/$j" >&5
++ echo "configure: 38337: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38279,7 +39144,7 @@
+@@ -38524,7 +38350,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 38282: $i/$j" >&5
-+ echo "configure: 39147: $i/$j" >&5
+- echo "configure: 38527: $i/$j" >&5
++ echo "configure: 38353: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -38303,7 +39168,7 @@
+@@ -38548,7 +38374,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 38306: $i/$j" >&5
-+ echo "configure: 39171: $i/$j" >&5
+- echo "configure: 38551: $i/$j" >&5
++ echo "configure: 38377: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38319,7 +39184,7 @@
+@@ -38564,7 +38390,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 38322: $i/$j" >&5
-+ echo "configure: 39187: $i/$j" >&5
+- echo "configure: 38567: $i/$j" >&5
++ echo "configure: 38393: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38335,7 +39200,7 @@
+@@ -38580,7 +38406,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 38338: $i/$j" >&5
-+ echo "configure: 39203: $i/$j" >&5
+- echo "configure: 38583: $i/$j" >&5
++ echo "configure: 38409: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -38363,7 +39228,7 @@
+@@ -38608,7 +38434,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 38366: $i/$j" >&5
-+ echo "configure: 39231: $i/$j" >&5
+- echo "configure: 38611: $i/$j" >&5
++ echo "configure: 38437: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -47724,7 +48589,7 @@
+@@ -48020,7 +47846,7 @@
do
for j in kspell2/broker.h;
do
-- echo "configure: 47727: $i/$j" >&5
-+ echo "configure: 48592: $i/$j" >&5
+- echo "configure: 48023: $i/$j" >&5
++ echo "configure: 47849: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ac_kspell2_includes=$i
-@@ -47800,7 +48665,7 @@
+@@ -48096,7 +47922,7 @@
do
for j in Python.h;
do
-- echo "configure: 47803: $i/$j" >&5
-+ echo "configure: 48668: $i/$j" >&5
+- echo "configure: 48099: $i/$j" >&5
++ echo "configure: 47925: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -47816,7 +48681,7 @@
+@@ -48112,7 +47938,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 47819: $i/$j" >&5
-+ echo "configure: 48684: $i/$j" >&5
+- echo "configure: 48115: $i/$j" >&5
++ echo "configure: 47941: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -47840,7 +48705,7 @@
+@@ -48136,7 +47962,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 47843: $i/$j" >&5
-+ echo "configure: 48708: $i/$j" >&5
+- echo "configure: 48139: $i/$j" >&5
++ echo "configure: 47965: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -47856,7 +48721,7 @@
+@@ -48152,7 +47978,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 47859: $i/$j" >&5
-+ echo "configure: 48724: $i/$j" >&5
+- echo "configure: 48155: $i/$j" >&5
++ echo "configure: 47981: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -47872,7 +48737,7 @@
+@@ -48168,7 +47994,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 47875: $i/$j" >&5
-+ echo "configure: 48740: $i/$j" >&5
+- echo "configure: 48171: $i/$j" >&5
++ echo "configure: 47997: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -47900,7 +48765,7 @@
+@@ -48196,7 +48022,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 47903: $i/$j" >&5
-+ echo "configure: 48768: $i/$j" >&5
+- echo "configure: 48199: $i/$j" >&5
++ echo "configure: 48025: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -47944,7 +48809,7 @@
+@@ -48240,7 +48066,7 @@
do
for j in Python.h;
do
-- echo "configure: 47947: $i/$j" >&5
-+ echo "configure: 48812: $i/$j" >&5
+- echo "configure: 48243: $i/$j" >&5
++ echo "configure: 48069: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -47960,7 +48825,7 @@
+@@ -48256,7 +48082,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 47963: $i/$j" >&5
-+ echo "configure: 48828: $i/$j" >&5
+- echo "configure: 48259: $i/$j" >&5
++ echo "configure: 48085: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -47984,7 +48849,7 @@
+@@ -48280,7 +48106,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 47987: $i/$j" >&5
-+ echo "configure: 48852: $i/$j" >&5
+- echo "configure: 48283: $i/$j" >&5
++ echo "configure: 48109: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48000,7 +48865,7 @@
+@@ -48296,7 +48122,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48003: $i/$j" >&5
-+ echo "configure: 48868: $i/$j" >&5
+- echo "configure: 48299: $i/$j" >&5
++ echo "configure: 48125: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48016,7 +48881,7 @@
+@@ -48312,7 +48138,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48019: $i/$j" >&5
-+ echo "configure: 48884: $i/$j" >&5
+- echo "configure: 48315: $i/$j" >&5
++ echo "configure: 48141: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48044,7 +48909,7 @@
+@@ -48340,7 +48166,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48047: $i/$j" >&5
-+ echo "configure: 48912: $i/$j" >&5
+- echo "configure: 48343: $i/$j" >&5
++ echo "configure: 48169: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48088,7 +48953,7 @@
+@@ -48384,7 +48210,7 @@
do
for j in Python.h;
do
-- echo "configure: 48091: $i/$j" >&5
-+ echo "configure: 48956: $i/$j" >&5
+- echo "configure: 48387: $i/$j" >&5
++ echo "configure: 48213: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48104,7 +48969,7 @@
+@@ -48400,7 +48226,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48107: $i/$j" >&5
-+ echo "configure: 48972: $i/$j" >&5
+- echo "configure: 48403: $i/$j" >&5
++ echo "configure: 48229: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48128,7 +48993,7 @@
+@@ -48424,7 +48250,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48131: $i/$j" >&5
-+ echo "configure: 48996: $i/$j" >&5
+- echo "configure: 48427: $i/$j" >&5
++ echo "configure: 48253: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48144,7 +49009,7 @@
+@@ -48440,7 +48266,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48147: $i/$j" >&5
-+ echo "configure: 49012: $i/$j" >&5
+- echo "configure: 48443: $i/$j" >&5
++ echo "configure: 48269: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48160,7 +49025,7 @@
+@@ -48456,7 +48282,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48163: $i/$j" >&5
-+ echo "configure: 49028: $i/$j" >&5
+- echo "configure: 48459: $i/$j" >&5
++ echo "configure: 48285: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48188,7 +49053,7 @@
+@@ -48484,7 +48310,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48191: $i/$j" >&5
-+ echo "configure: 49056: $i/$j" >&5
+- echo "configure: 48487: $i/$j" >&5
++ echo "configure: 48313: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48232,7 +49097,7 @@
+@@ -48528,7 +48354,7 @@
do
for j in Python.h;
do
-- echo "configure: 48235: $i/$j" >&5
-+ echo "configure: 49100: $i/$j" >&5
+- echo "configure: 48531: $i/$j" >&5
++ echo "configure: 48357: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48248,7 +49113,7 @@
+@@ -48544,7 +48370,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48251: $i/$j" >&5
-+ echo "configure: 49116: $i/$j" >&5
+- echo "configure: 48547: $i/$j" >&5
++ echo "configure: 48373: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48272,7 +49137,7 @@
+@@ -48568,7 +48394,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48275: $i/$j" >&5
-+ echo "configure: 49140: $i/$j" >&5
+- echo "configure: 48571: $i/$j" >&5
++ echo "configure: 48397: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48288,7 +49153,7 @@
+@@ -48584,7 +48410,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48291: $i/$j" >&5
-+ echo "configure: 49156: $i/$j" >&5
+- echo "configure: 48587: $i/$j" >&5
++ echo "configure: 48413: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48304,7 +49169,7 @@
+@@ -48600,7 +48426,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48307: $i/$j" >&5
-+ echo "configure: 49172: $i/$j" >&5
+- echo "configure: 48603: $i/$j" >&5
++ echo "configure: 48429: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48332,7 +49197,7 @@
+@@ -48628,7 +48454,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48335: $i/$j" >&5
-+ echo "configure: 49200: $i/$j" >&5
+- echo "configure: 48631: $i/$j" >&5
++ echo "configure: 48457: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48376,7 +49241,7 @@
+@@ -48672,7 +48498,7 @@
do
for j in Python.h;
do
-- echo "configure: 48379: $i/$j" >&5
-+ echo "configure: 49244: $i/$j" >&5
+- echo "configure: 48675: $i/$j" >&5
++ echo "configure: 48501: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48392,7 +49257,7 @@
+@@ -48688,7 +48514,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48395: $i/$j" >&5
-+ echo "configure: 49260: $i/$j" >&5
+- echo "configure: 48691: $i/$j" >&5
++ echo "configure: 48517: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48416,7 +49281,7 @@
+@@ -48712,7 +48538,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48419: $i/$j" >&5
-+ echo "configure: 49284: $i/$j" >&5
+- echo "configure: 48715: $i/$j" >&5
++ echo "configure: 48541: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48432,7 +49297,7 @@
+@@ -48728,7 +48554,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48435: $i/$j" >&5
-+ echo "configure: 49300: $i/$j" >&5
+- echo "configure: 48731: $i/$j" >&5
++ echo "configure: 48557: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48448,7 +49313,7 @@
+@@ -48744,7 +48570,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48451: $i/$j" >&5
-+ echo "configure: 49316: $i/$j" >&5
+- echo "configure: 48747: $i/$j" >&5
++ echo "configure: 48573: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48476,7 +49341,7 @@
+@@ -48772,7 +48598,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48479: $i/$j" >&5
-+ echo "configure: 49344: $i/$j" >&5
+- echo "configure: 48775: $i/$j" >&5
++ echo "configure: 48601: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -48520,7 +49385,7 @@
+@@ -48816,7 +48642,7 @@
do
for j in Python.h;
do
-- echo "configure: 48523: $i/$j" >&5
-+ echo "configure: 49388: $i/$j" >&5
+- echo "configure: 48819: $i/$j" >&5
++ echo "configure: 48645: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48536,7 +49401,7 @@
+@@ -48832,7 +48658,7 @@
do
for j in python$version/Python.h;
do
-- echo "configure: 48539: $i/$j" >&5
-+ echo "configure: 49404: $i/$j" >&5
+- echo "configure: 48835: $i/$j" >&5
++ echo "configure: 48661: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_incdir=$i
-@@ -48560,7 +49425,7 @@
+@@ -48856,7 +48682,7 @@
do
for j in libpython$version.so;
do
-- echo "configure: 48563: $i/$j" >&5
-+ echo "configure: 49428: $i/$j" >&5
+- echo "configure: 48859: $i/$j" >&5
++ echo "configure: 48685: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48576,7 +49441,7 @@
+@@ -48872,7 +48698,7 @@
do
for j in libpython$version.a;
do
-- echo "configure: 48579: $i/$j" >&5
-+ echo "configure: 49444: $i/$j" >&5
+- echo "configure: 48875: $i/$j" >&5
++ echo "configure: 48701: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48592,7 +49457,7 @@
+@@ -48888,7 +48714,7 @@
do
for j in python$version/config/libpython$version.a;
do
-- echo "configure: 48595: $i/$j" >&5
-+ echo "configure: 49460: $i/$j" >&5
+- echo "configure: 48891: $i/$j" >&5
++ echo "configure: 48717: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_libdir=$i
-@@ -48620,7 +49485,7 @@
+@@ -48916,7 +48742,7 @@
do
for j in python$version/copy.py;
do
-- echo "configure: 48623: $i/$j" >&5
-+ echo "configure: 49488: $i/$j" >&5
+- echo "configure: 48919: $i/$j" >&5
++ echo "configure: 48745: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
python_moddir=$i
-@@ -58114,6 +58979,13 @@
+@@ -58434,6 +58260,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9843,10 +15194,10 @@
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
-@@ -59675,6 +60547,9 @@
- s, at AWK@,$AWK,;t t
- s, at SET_MAKE@,$SET_MAKE,;t t
- s, at am__leading_dot@,$am__leading_dot,;t t
+@@ -60005,6 +59838,9 @@
+ s, at AMTAR@,$AMTAR,;t t
+ s, at am__tar@,$am__tar,;t t
+ s, at am__untar@,$am__untar,;t t
+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s, at MAINT@,$MAINT,;t t
@@ -9857,14 +15208,14 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(koffice, "1.4.90") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(koffice, "1.4.95") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -417,7 +419,8 @@
+@@ -431,7 +433,8 @@
vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test -n "$vers" && test "$vers" -ge 1009
then
@@ -9874,41 +15225,14 @@
LIBWV2_RPATH=
for args in $LIBWV2_LIBS; do
case $args in
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -249,6 +249,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@
-@@ -533,7 +536,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(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*) \
-@@ -571,9 +574,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
-
- mostlyclean-libtool:
--- doc/karbon/Makefile.in
+++ doc/karbon/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9919,7 +15243,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9928,7 +15252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9942,6 +15266,12 @@
mostlyclean-libtool:
--- doc/kchart/Makefile.in
+++ doc/kchart/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9952,7 +15282,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9961,7 +15291,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9975,6 +15305,12 @@
mostlyclean-libtool:
--- doc/kexi/Makefile.in
+++ doc/kexi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9985,7 +15321,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9994,7 +15330,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10008,6 +15344,12 @@
mostlyclean-libtool:
--- doc/kformula/Makefile.in
+++ doc/kformula/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10018,7 +15360,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10027,7 +15369,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10041,6 +15383,12 @@
mostlyclean-libtool:
--- doc/kivio/Makefile.in
+++ doc/kivio/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10051,7 +15399,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10060,7 +15408,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10074,6 +15422,12 @@
mostlyclean-libtool:
--- doc/koffice/Makefile.in
+++ doc/koffice/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10084,7 +15438,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10093,7 +15447,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10107,6 +15461,12 @@
mostlyclean-libtool:
--- doc/koshell/Makefile.in
+++ doc/koshell/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10117,7 +15477,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10126,7 +15486,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10140,6 +15500,12 @@
mostlyclean-libtool:
--- doc/kplato/Makefile.in
+++ doc/kplato/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10150,7 +15516,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10159,7 +15525,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10173,6 +15539,12 @@
mostlyclean-libtool:
--- doc/kpresenter/Makefile.in
+++ doc/kpresenter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10183,7 +15555,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10192,7 +15564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10206,6 +15578,12 @@
mostlyclean-libtool:
--- doc/krita/Makefile.in
+++ doc/krita/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10216,7 +15594,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10225,7 +15603,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10237,8 +15615,47 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -707,7 +710,7 @@
+ KDE_DIST=dialogs-colorrange.png crocusses-sobel.png crocusses-topedge.png tutorial-quick-starts12.png palettes-controlbox-contiguousfill.png dialogs-customconvolution.png using-selections-5.png settings.docbook tutorial-quick-starts6.png using-selections-2.png developers.docbook toolbar-brushes-patterns-custompattern.png palettes-layers-layers.png tool-polygon.png palettes-controlbox-rectangle.png index.docbook dialogs-convertlayertype.png dialogs-emboss.png palettes-colors-rgb.png palettes-controlbox-polygon.png commands-palettes.docbook crocusses-bumpmap.png tool-selectoutline.png tutorial-select-layer-1.png toolbar-brushes-patterns.png dialogs-imagesize.png dialogs-bumpmap.png preferences-performance.png tool-duplicate.png palettes-controlbox-paintwithfilters.png tool-text.png tool-brush.png tutorial-select-layer-9.png dialogs-convertimagetype.png palettes-layers-scriptsmanager.png dialogs-roundcorners.png crocusses-edgeright.png preferences-color.png dialogs-layerproperties.png dialogs-imagerestoration.png palettes-colors-palettes.png tool-line.png tool-pan.png tool-paintselection.png palettes-controlbox-transform.png crocusses-sharpen.png faq.docbook crocusses-raindrops.png tool-move.png palettes-controlbox-select.png dialogs-dropshadow.png tool-selectelliptical.png toolbar-file.png crocusses.png palettes-controlbox-selectcontiguous.png tool-selectrectangular.png toolbar-edit.png palettes-controlbox-star.png tutorial-select-layer-13.png tutorial-select-layer-7.png preferences-sidebar.png tutorial-quick-starts5.png using-filters.docbook tutorial-select-layer-5.png toolbar-brushesandstuff.png crocusses-edgebottom.png palettes-controlbox-overview.png palettes-controlbox-brush.png dialogs-shearimage.png palettes-controlbox-selectsimilar.png toolbar-krita.png crocusses-embossvariable.png toolbar-transformationtools.png palettes-colors-hsv.png Makefile.in dialogs-histogram.png tutorial-select-layer-3.png commands-menus.docbook introduction.docbook crocusses-tiles.png tutorial-quick-starts1.png dialogs-documentinformation.png using-selections-4.png crocusses-invert.png crocusses-embosshorvert.png newimage.png palettes-controlbox-text.png using-selections.docbook tutorial-select-layer-sample.png palettes-colors-watercolors.png installation.docbook tutorial-select-layer-10.png dialogs-coloradjustment.png tool-rectangle.png dialogs-cubism.png toolbar-brushes-brushshapes-predefined.png crocusses-edgeleft.png dialogs-addpalette.png crocusses-embossall.png using-layers.docbook tool-transform.png preferences-grid.png crocusses-roundcorners.png tutorial-select-layer-4.png dialogs-filtersgallery.png tool-selectpolygonal.png dialogs-newlayer.png tool-star.png tutorial-quick-starts10.png dialogs-brightnesscontrast.png using-selections-3.png commands-dialogs.docbook palettes-controlbox-histogram.png dialogs-rotateimage.png tutorial-select-layer-2.png scripting.docbook tutorial-quick-starts8.png dialogs-pixelize.png tutorial-quick-starts.docbook tool-ellipse.png credits.docbook crocusses-simplenoise.png dialogs-layersize.png dialogs-shearlayer.png tutorial.docbook tool-contiguousfill.png commands.docbook palettes-controlbox-line.png tutorial-quick-starts3.png tutorial-select-layer-12.png crocusses-pixelize.png dialogs-rotatelayer.png preferences-general.png commands-toolbars.docbook toolbar-brushes-gradients.png tool-eraseselection.png dialogs-oilpaint.png index.cache.bz2 toolbar-navigation.png tutorial-select-layer-6.png using-selections-1.png using-selections-6.png tutorial-select-layer-8.png tutorial-quick-starts9.png palettes-controlbox-crop.png tutorial-quick-starts2.png palettes-colors-gray.png tutorial-quick-starts7.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-gradient.png tool-colorpicker.png dialogs-separateimage.png dialogs-newadjustmentlayer.png using-colorspaces.docbook dialogs-sobel.png palettes-controlbox-colorpicker.png tool-zoom.png crocusses-oilpaint.png tutorial-quick-starts11.png tool-selectsimilar.png tutorial-starting.docbook dialogs-smalltiles.png preferences-display.png preferences-tablet.png tool-selectcontiguous.png crocusses-gaussianblur.png dialogs-imageproperties.png tool-paintwithfilters.png dialogs-raindrops.png tutorial-select-layer.docbook tool-gradient.png toolbar-brushes-brushshapes-autobrush.png tutorial-select-layer-11.png tool-crop.png mainscreen.png crocusses-meanremoval.png tutorial-quick-starts4.png tool-polyline.png createdocument.png Makefile.am
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png crocusses-sobel.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png crocusses-sobel.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png
+ @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
+@@ -734,20 +737,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita
+- @for base in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png crocusses-sobel.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
++ @for base in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png crocusses-sobel.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png crocusses-sobel.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
++ for base in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png crocusses-sobel.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png crocusses-sobel.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
++ for file in tool-ellipse.png tool-polygon.png commands-menus.docbook tool-duplicate.png dialogs-imagerestoration.png toolbar-brushes-brushshapes-predefined.png tool-selectelliptical.png palettes-controlbox-brush.png crocusses-edgeleft.png tool-move.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-overview.png crocusses-tiles.png palettes-colors-watercolors.png dialogs-newadjustmentlayer.png toolbar-brushes-gradients.png palettes-controlbox-crop.png tutorial-select-layer-1.png tutorial-select-layer-2.png palettes-colors-palettes.png tutorial-select-layer-3.png tutorial-select-layer-4.png tutorial-select-layer-5.png preferences-performance.png tutorial-select-layer-6.png tutorial-select-layer-7.png tutorial-select-layer-8.png tool-pan.png tutorial-select-layer-9.png crocusses-raindrops.png preferences-tablet.png palettes-controlbox-line.png installation.docbook dialogs-pixelize.png crocusses-simplenoise.png dialogs-oilpaint.png tool-selectoutline.png commands-dialogs.docbook tool-contiguousfill.png crocusses-meanremoval.png crocusses-embossvariable.png dialogs-dropshadow.png tutorial-quick-starts1.png tutorial-quick-starts2.png tutorial-quick-starts3.png tutorial-quick-starts4.png palettes-controlbox-selectsimilar.png introduction.docbook tutorial-quick-starts5.png tutorial-quick-starts6.png tutorial-quick-starts7.png scripting.docbook tutorial-quick-starts8.png tool-star.png tutorial-quick-starts9.png developers.docbook palettes-controlbox-select.png dialogs-imageproperties.png toolbar-brushesandstuff.png dialogs-rotateimage.png createdocument.png dialogs-rotatelayer.png dialogs-filtersgallery.png dialogs-separateimage.png dialogs-documentinformation.png crocusses-sharpen.png dialogs-sobel.png toolbar-file.png crocusses-embosshorvert.png dialogs-coloradjustment.png crocusses-bumpmap.png dialogs-customconvolution.png tool-selectsimilar.png crocusses-invert.png tool-polyline.png tutorial-select-layer.docbook crocusses-gaussianblur.png preferences-display.png tutorial-starting.docbook commands-palettes.docbook tutorial-quick-starts.docbook preferences-grid.png tool-crop.png dialogs-layersize.png dialogs-bumpmap.png dialogs-smalltiles.png newimage.png dialogs-layerproperties.png tool-line.png palettes-colors-hsv.png dialogs-emboss.png palettes-controlbox-selectcontiguous.png tool-selectcontiguous.png using-colorspaces.docbook using-selections-1.png commands.docbook using-selections-2.png using-selections-3.png using-selections-4.png using-selections-5.png using-selections-6.png crocusses-roundcorners.png dialogs-roundcorners.png dialogs-imagesize.png dialogs-raindrops.png toolbar-brushes-patterns.png preferences-color.png toolbar-transformationtools.png palettes-controlbox-histogram.png tool-rectangle.png preferences-sidebar.png crocusses-embossall.png palettes-controlbox-rectangle.png crocusses-pixelize.png crocusses-oilpaint.png palettes-controlbox-text.png commands-toolbars.docbook dialogs-shearimage.png crocusses-sobel.png tool-eraseselection.png tutorial-quick-starts10.png tutorial-quick-starts11.png dialogs-shearlayer.png tutorial-quick-starts12.png settings.docbook tutorial-select-layer-10.png tutorial-select-layer-11.png tutorial-select-layer-12.png tutorial-select-layer-13.png palettes-controlbox-colorpicker.png crocusses-edgebottom.png faq.docbook dialogs-histogram.png palettes-layers-scriptsmanager.png tool-selectrectangular.png toolbar-brushes-brushshapes-autobrush.png tool-transform.png dialogs-convertlayertype.png dialogs-colorrange.png palettes-controlbox-transform.png dialogs-cubism.png toolbar-krita.png palettes-colors-rgb.png dialogs-newlayer.png palettes-colors-gray.png tool-brush.png tutorial.docbook toolbar-navigation.png tool-paintselection.png crocusses-topedge.png palettes-controlbox-contiguousfill.png dialogs-convertimagetype.png dialogs-brightnesscontrast.png tool-colorpicker.png dialogs-addpalette.png tool-gradient.png palettes-controlbox-gradient.png tool-zoom.png palettes-layers-layers.png index.docbook toolbar-brushes-patterns-custompattern.png using-selections.docbook preferences-general.png credits.docbook palettes-controlbox-star.png using-layers.docbook palettes-controlbox-polygon.png tutorial-select-layer-sample.png tool-text.png crocusses.png palettes-controlbox-paintwithfilters.png tool-paintwithfilters.png crocusses-edgeright.png using-filters.docbook toolbar-edit.png mainscreen.png tool-selectpolygonal.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
--- doc/kspread/Makefile.in
+++ doc/kspread/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10249,7 +15666,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10258,7 +15675,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10272,6 +15689,12 @@
mostlyclean-libtool:
--- doc/kugar/Makefile.in
+++ doc/kugar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10282,7 +15705,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10291,7 +15714,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10305,6 +15728,12 @@
mostlyclean-libtool:
--- doc/kword/Makefile.in
+++ doc/kword/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10315,7 +15744,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10324,7 +15753,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10336,9 +15765,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- doc/thesaurus/Makefile.in
-+++ doc/thesaurus/Makefile.in
-@@ -233,6 +233,9 @@
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10348,8 +15783,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
- all: docs-am all-am
+@@ -538,7 +541,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -10357,7 +15792,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10369,9 +15804,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- example/Makefile.in
-+++ example/Makefile.in
-@@ -313,6 +313,9 @@
+--- doc/thesaurus/Makefile.in
++++ doc/thesaurus/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10381,16 +15822,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -519,7 +522,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+-$(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*) \
-@@ -660,9 +663,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10400,11 +15841,39 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- filters/Makefile.in
-+++ filters/Makefile.in
-@@ -252,6 +252,9 @@
+
+ mostlyclean-libtool:
+--- example/Makefile.in
++++ example/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES) $(example_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -118,7 +114,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES)
++#>- SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES)
++#>+ 1
++SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES) $(example_SOURCES)
+ #>- DIST_SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(example_la_SOURCES) $(libexamplepart_la_SOURCES) $(example_SOURCES)
+@@ -313,6 +311,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10414,16 +15883,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
- all: docs-am all-recursive
+@@ -627,7 +628,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -665,9 +666,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10433,11 +15902,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- filters/generic_wrapper/Makefile.in
+++ filters/generic_wrapper/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libgenerickofilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10447,7 +15931,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10456,7 +15940,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10468,9 +15952,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/karbon/Makefile.in
-+++ filters/karbon/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/karbon/ai/Makefile.in
++++ filters/karbon/ai/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkarbonaiimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10480,16 +15979,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -621,7 +622,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -567,9 +570,9 @@
+@@ -659,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10499,11 +15998,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/karbon/applixgraphics/Makefile.in
++++ filters/karbon/applixgraphics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/karbon/ai/Makefile.in
-+++ filters/karbon/ai/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libapplixgraphicimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10513,7 +16027,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10522,7 +16036,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10534,9 +16048,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/karbon/applixgraphics/Makefile.in
-+++ filters/karbon/applixgraphics/Makefile.in
-@@ -280,6 +280,9 @@
+--- filters/karbon/eps/Makefile.in
++++ filters/karbon/eps/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkarbonepsexport_la_SOURCES) $(libkarbonepsimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -295,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10546,7 +16075,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -614,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10555,7 +16084,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10567,9 +16096,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/karbon/eps/Makefile.in
-+++ filters/karbon/eps/Makefile.in
-@@ -301,6 +301,9 @@
+--- filters/karbon/kontour/Makefile.in
++++ filters/karbon/kontour/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libkarbonkontourimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10579,16 +16123,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -653,9 +656,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10600,9 +16144,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/karbon/kontour/Makefile.in
-+++ filters/karbon/kontour/Makefile.in
-@@ -278,6 +278,9 @@
+--- filters/karbon/Makefile.in
++++ filters/karbon/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10612,16 +16162,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -609,9 +612,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10631,11 +16181,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- filters/karbon/msod/Makefile.in
+++ filters/karbon/msod/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkarbonmsodimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10645,7 +16210,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10654,7 +16219,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10668,7 +16233,22 @@
@$(NORMAL_INSTALL)
--- filters/karbon/oodraw/Makefile.in
+++ filters/karbon/oodraw/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(liboodrawimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10678,7 +16258,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10687,7 +16267,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10701,7 +16281,22 @@
@$(NORMAL_INSTALL)
--- filters/karbon/png/Makefile.in
+++ filters/karbon/png/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkarbonpngexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10711,7 +16306,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10720,7 +16315,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10734,7 +16329,22 @@
@$(NORMAL_INSTALL)
--- filters/karbon/svg/Makefile.in
+++ filters/karbon/svg/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkarbonsvgexport_la_SOURCES) $(libkarbonsvgimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10744,7 +16354,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -606,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10753,7 +16363,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -644,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10767,7 +16377,22 @@
@$(NORMAL_INSTALL)
--- filters/karbon/wmf/Makefile.in
+++ filters/karbon/wmf/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libwmfexport_la_SOURCES) $(libwmfimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10777,7 +16402,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10786,7 +16411,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10800,7 +16425,22 @@
@$(NORMAL_INSTALL)
--- filters/karbon/xaml/Makefile.in
+++ filters/karbon/xaml/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkarbonxamlexport_la_SOURCES) $(libkarbonxamlimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10810,7 +16450,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -607,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10819,7 +16459,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -645,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10833,7 +16473,22 @@
@$(NORMAL_INSTALL)
--- filters/karbon/xcf/Makefile.in
+++ filters/karbon/xcf/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkarbonxcfexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10843,7 +16498,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -10852,7 +16507,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10864,9 +16519,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kchart/Makefile.in
-+++ filters/kchart/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/kchart/bmp/Makefile.in
++++ filters/kchart/bmp/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkchartbmpexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10876,16 +16546,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -593,7 +594,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*) \
-@@ -567,9 +570,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10895,11 +16565,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kchart/jpeg/Makefile.in
++++ filters/kchart/jpeg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/kchart/bmp/Makefile.in
-+++ filters/kchart/bmp/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkchartjpegexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10909,7 +16594,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10918,7 +16603,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10930,9 +16615,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kchart/jpeg/Makefile.in
-+++ filters/kchart/jpeg/Makefile.in
-@@ -283,6 +283,9 @@
+--- filters/kchart/libimageexport/Makefile.in
++++ filters/kchart/libimageexport/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libkchartimageexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10942,7 +16642,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10951,7 +16651,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10961,11 +16661,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kchart/libimageexport/Makefile.in
-+++ filters/kchart/libimageexport/Makefile.in
-@@ -280,6 +280,9 @@
+--- filters/kchart/Makefile.in
++++ filters/kchart/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10975,16 +16681,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -617,9 +620,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10994,11 +16700,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- filters/kchart/mng/Makefile.in
+++ filters/kchart/mng/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkchartmngexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11008,7 +16729,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11017,7 +16738,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11031,7 +16752,22 @@
@$(NORMAL_INSTALL)
--- filters/kchart/png/Makefile.in
+++ filters/kchart/png/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkchartpngexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11041,7 +16777,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11050,7 +16786,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11064,7 +16800,22 @@
@$(NORMAL_INSTALL)
--- filters/kchart/svg/Makefile.in
+++ filters/kchart/svg/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkchartsvgexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11074,7 +16825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11083,7 +16834,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11097,7 +16848,22 @@
@$(NORMAL_INSTALL)
--- filters/kchart/xbm/Makefile.in
+++ filters/kchart/xbm/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkchartxbmexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11107,7 +16873,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11116,7 +16882,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11130,7 +16896,22 @@
@$(NORMAL_INSTALL)
--- filters/kchart/xpm/Makefile.in
+++ filters/kchart/xpm/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkchartxpmexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11140,7 +16921,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11149,7 +16930,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11161,9 +16942,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kformula/Makefile.in
-+++ filters/kformula/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/kformula/latex/Makefile.in
++++ filters/kformula/latex/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkfolatexexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11173,16 +16969,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -588,7 +589,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -567,9 +570,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11192,11 +16988,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kformula/Makefile.in
++++ filters/kformula/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/kformula/latex/Makefile.in
-+++ filters/kformula/latex/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11206,16 +17008,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -617,9 +620,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11225,11 +17027,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- filters/kformula/mathml/Makefile.in
+++ filters/kformula/mathml/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkfomathmlexport_la_SOURCES) $(libkfomathmlimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11239,7 +17056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11248,7 +17065,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11262,7 +17079,22 @@
@$(NORMAL_INSTALL)
--- filters/kformula/png/Makefile.in
+++ filters/kformula/png/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkfopngexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11272,7 +17104,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11281,7 +17113,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11295,7 +17127,22 @@
@$(NORMAL_INSTALL)
--- filters/kformula/svg/Makefile.in
+++ filters/kformula/svg/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkfosvgexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11305,7 +17152,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11314,7 +17161,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11326,42 +17173,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kivio/Makefile.in
-+++ filters/kivio/Makefile.in
-@@ -249,6 +249,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@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+--- filters/kivio/imageexport/Makefile.in
++++ filters/kivio/imageexport/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- .SUFFIXES:
--$(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*) \
-@@ -567,9 +570,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
--$(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
- mostlyclean-libtool:
---- filters/kivio/imageexport/Makefile.in
-+++ filters/kivio/imageexport/Makefile.in
-@@ -285,6 +285,9 @@
+-SOURCES = $(libkivioimageexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11371,7 +17200,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11380,7 +17209,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11392,8 +17221,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kpresenter/Makefile.in
-+++ filters/kpresenter/Makefile.in
+--- filters/kivio/Makefile.in
++++ filters/kivio/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11404,7 +17239,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11413,7 +17248,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11427,7 +17262,22 @@
mostlyclean-libtool:
--- filters/kpresenter/bmp/Makefile.in
+++ filters/kpresenter/bmp/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkpresenterbmpexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11437,7 +17287,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11446,7 +17296,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11460,7 +17310,22 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/jpeg/Makefile.in
+++ filters/kpresenter/jpeg/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkpresenterjpegexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11470,7 +17335,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11479,7 +17344,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11493,7 +17358,22 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/kword/Makefile.in
+++ filters/kpresenter/kword/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkprkword_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11503,7 +17383,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -573,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11512,7 +17392,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -611,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11526,7 +17406,22 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/libimageexport/Makefile.in
+++ filters/kpresenter/libimageexport/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libkpresenterimageexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11536,7 +17431,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11545,7 +17440,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11559,7 +17454,13 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/magicpoint/Makefile.in
+++ filters/kpresenter/magicpoint/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11569,7 +17470,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -533,7 +536,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11578,7 +17479,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -560,9 +563,9 @@
+@@ -571,9 +574,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11590,9 +17491,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
+--- filters/kpresenter/Makefile.in
++++ filters/kpresenter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
+ 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@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(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*) \
+@@ -572,9 +575,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
+
+ mostlyclean-libtool:
--- filters/kpresenter/mng/Makefile.in
+++ filters/kpresenter/mng/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkpresentermngexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11602,7 +17557,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11611,7 +17566,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11625,7 +17580,22 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/ooimpress/Makefile.in
+++ filters/kpresenter/ooimpress/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libooimpressexport_la_SOURCES) $(libooimpressimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11635,7 +17605,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11644,7 +17614,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11658,7 +17628,22 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/png/Makefile.in
+++ filters/kpresenter/png/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkpresenterpngexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11668,7 +17653,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11677,7 +17662,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11689,9 +17674,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kpresenter/powerpoint/Makefile.in
-+++ filters/kpresenter/powerpoint/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/kpresenter/powerpoint/import/Makefile.in
++++ filters/kpresenter/powerpoint/import/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libpowerpointimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11701,16 +17701,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -576,7 +577,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -567,9 +570,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11720,11 +17720,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kpresenter/powerpoint/libppt/Makefile.in
++++ filters/kpresenter/powerpoint/libppt/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/kpresenter/powerpoint/import/Makefile.in
-+++ filters/kpresenter/powerpoint/import/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libppt_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11734,16 +17749,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -558,7 +559,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -605,9 +608,9 @@
+@@ -596,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11753,11 +17768,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- filters/kpresenter/powerpoint/libppt/Makefile.in
-+++ filters/kpresenter/powerpoint/libppt/Makefile.in
-@@ -283,6 +283,9 @@
+
+ clean-noinstLTLIBRARIES:
+--- filters/kpresenter/powerpoint/Makefile.in
++++ filters/kpresenter/powerpoint/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11767,16 +17788,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -604,9 +607,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11787,10 +17808,25 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
+ mostlyclean-libtool:
--- filters/kpresenter/svg/Makefile.in
+++ filters/kpresenter/svg/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkpresentersvgexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11800,7 +17836,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -11809,7 +17845,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11823,7 +17859,22 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/xbm/Makefile.in
+++ filters/kpresenter/xbm/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkpresenterxbmexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11833,7 +17884,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11842,7 +17893,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11856,7 +17907,22 @@
@$(NORMAL_INSTALL)
--- filters/kpresenter/xpm/Makefile.in
+++ filters/kpresenter/xpm/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkpresenterxpmexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11866,7 +17932,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11875,7 +17941,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11887,9 +17953,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/krita/Makefile.in
-+++ filters/krita/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/krita/jpeg/Makefile.in
++++ filters/krita/jpeg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritaconverter_la_SOURCES) $(libkritajpegexport_la_SOURCES) $(libkritajpegimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -312,6 +310,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11899,16 +17980,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -644,7 +645,7 @@
.SUFFIXES:
+ .SUFFIXES: .c .cc .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*) \
-@@ -572,9 +575,9 @@
+@@ -682,9 +683,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11918,11 +17999,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/krita/libkisexif/Makefile.in
++++ filters/krita/libkisexif/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/krita/jpeg/Makefile.in
-+++ filters/krita/jpeg/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkisexif_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11932,16 +18028,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -642,7 +645,7 @@
+@@ -567,7 +568,7 @@
.SUFFIXES:
- .SUFFIXES: .c .cc .lo .o .obj
+ .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*) \
-@@ -680,9 +683,9 @@
+@@ -605,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11951,11 +18047,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ clean-noinstLTLIBRARIES:
--- filters/krita/magick/Makefile.in
+++ filters/krita/magick/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritamagickexport_la_SOURCES) $(libkritamagickimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -300,6 +298,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11965,7 +18076,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -618,7 +621,7 @@
+@@ -623,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -11974,7 +18085,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -656,9 +659,9 @@
+@@ -661,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11986,9 +18097,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/krita/openexr/Makefile.in
-+++ filters/krita/openexr/Makefile.in
-@@ -292,6 +292,9 @@
+--- filters/krita/Makefile.in
++++ filters/krita/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11998,16 +18115,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -542,7 +545,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -654,9 +657,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12017,11 +18134,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- filters/krita/png/Makefile.in
-+++ filters/krita/png/Makefile.in
-@@ -301,6 +301,9 @@
+
+ mostlyclean-libtool:
+--- filters/krita/openexr/Makefile.in
++++ filters/krita/openexr/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkrita_openexr_export_la_SOURCES) $(libkrita_openexr_import_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12031,16 +18163,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +624,7 @@
+@@ -623,7 +624,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -659,9 +662,9 @@
+@@ -661,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12052,9 +18184,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/krita/raw/Makefile.in
-+++ filters/krita/raw/Makefile.in
-@@ -281,6 +281,9 @@
+--- filters/krita/png/Makefile.in
++++ filters/krita/png/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritapngexport_la_SOURCES) $(libkritapngimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12064,16 +18211,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -623,7 +624,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .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*) \
-@@ -631,9 +634,9 @@
+@@ -661,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12085,9 +18232,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/krita/tiff/Makefile.in
-+++ filters/krita/tiff/Makefile.in
-@@ -328,6 +328,9 @@
+--- filters/krita/raw/Makefile.in
++++ filters/krita/raw/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkrita_raw_import_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12097,16 +18259,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -661,7 +664,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
+ .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*) \
-@@ -699,9 +702,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12118,9 +18280,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/krita/xcf/Makefile.in
-+++ filters/krita/xcf/Makefile.in
-@@ -293,6 +293,9 @@
+--- filters/krita/tiff/Makefile.in
++++ filters/krita/tiff/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkritatiffconverter_la_SOURCES) $(libkritatiffexport_la_SOURCES) $(libkritatiffimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -313,6 +311,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12130,7 +18307,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -653,7 +654,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -12139,7 +18316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -691,9 +692,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12151,9 +18328,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kspread/Makefile.in
-+++ filters/kspread/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/krita/xcf/Makefile.in
++++ filters/krita/xcf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritaxcfexport_la_SOURCES) $(libkritaxcfimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12163,16 +18355,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -623,7 +624,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*) \
-@@ -567,9 +570,9 @@
+@@ -661,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12182,11 +18374,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- filters/kspread/applixspread/Makefile.in
+++ filters/kspread/applixspread/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libapplixspreadimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12196,7 +18403,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12205,7 +18412,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12219,7 +18426,22 @@
@$(NORMAL_INSTALL)
--- filters/kspread/csv/Makefile.in
+++ filters/kspread/csv/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libcsvexport_la_SOURCES) $(libcsvimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12229,7 +18451,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -12238,7 +18460,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12252,7 +18474,22 @@
@$(NORMAL_INSTALL)
--- filters/kspread/dbase/Makefile.in
+++ filters/kspread/dbase/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libdbaseimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12262,7 +18499,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -12271,7 +18508,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12283,9 +18520,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kspread/excel/Makefile.in
-+++ filters/kspread/excel/Makefile.in
-@@ -251,6 +251,9 @@
+--- filters/kspread/excel/import/Makefile.in
++++ filters/kspread/excel/import/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libexcelimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12295,16 +18547,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
- all: docs-am all-recursive
+@@ -580,7 +581,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -576,9 +579,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12314,11 +18566,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kspread/excel/Makefile.in
++++ filters/kspread/excel/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/kspread/excel/import/Makefile.in
-+++ filters/kspread/excel/import/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12328,16 +18586,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -543,7 +546,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -609,9 +612,9 @@
+@@ -581,9 +584,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12347,11 +18605,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- filters/kspread/excel/sidewinder/Makefile.in
+++ filters/kspread/excel/sidewinder/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libsidewinder_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12361,7 +18634,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -558,7 +559,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12370,7 +18643,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -596,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12384,7 +18657,22 @@
clean-noinstLTLIBRARIES:
--- filters/kspread/gnumeric/Makefile.in
+++ filters/kspread/gnumeric/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libgnumericexport_la_SOURCES) $(libgnumericimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12394,7 +18682,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12403,7 +18691,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12417,7 +18705,22 @@
@$(NORMAL_INSTALL)
--- filters/kspread/html/Makefile.in
+++ filters/kspread/html/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libkspreadhtmlexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12427,7 +18730,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12436,7 +18739,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12448,9 +18751,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kspread/latex/Makefile.in
-+++ filters/kspread/latex/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/kspread/latex/export/Makefile.in
++++ filters/kspread/latex/export/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkspreadlatexexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12460,16 +18778,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -614,7 +615,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -567,9 +570,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12479,11 +18797,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kspread/latex/Makefile.in
++++ filters/kspread/latex/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/kspread/latex/export/Makefile.in
-+++ filters/kspread/latex/export/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12493,16 +18817,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -668,9 +671,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12512,11 +18836,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- filters/kspread/libkspreadexport/Makefile.in
+++ filters/kspread/libkspreadexport/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libkspreadexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12526,7 +18865,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12535,7 +18874,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12547,9 +18886,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kspread/opencalc/Makefile.in
-+++ filters/kspread/opencalc/Makefile.in
-@@ -299,6 +299,9 @@
+--- filters/kspread/Makefile.in
++++ filters/kspread/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12559,16 +18904,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -636,9 +639,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12578,11 +18923,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- filters/kspread/qpro/Makefile.in
-+++ filters/kspread/qpro/Makefile.in
-@@ -298,6 +298,9 @@
+
+ mostlyclean-libtool:
+--- filters/kspread/opencalc/Makefile.in
++++ filters/kspread/opencalc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libopencalcexport_la_SOURCES) $(libopencalcimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12592,7 +18952,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12601,7 +18961,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12615,6 +18975,12 @@
@$(NORMAL_INSTALL)
--- filters/kspread/qpro/libqpro/Makefile.in
+++ filters/kspread/qpro/libqpro/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12625,7 +18991,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12634,7 +19000,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12648,6 +19014,12 @@
mostlyclean-libtool:
--- filters/kspread/qpro/libqpro/qpro/Makefile.in
+++ filters/kspread/qpro/libqpro/qpro/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -238,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12658,7 +19030,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -523,7 +526,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12667,7 +19039,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -561,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12681,7 +19053,22 @@
mostlyclean-libtool:
--- filters/kspread/qpro/libqpro/src/Makefile.in
+++ filters/kspread/qpro/libqpro/src/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libqpro_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12691,7 +19078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -558,7 +559,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12700,7 +19087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -596,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12712,9 +19099,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- filters/kugar/Makefile.in
-+++ filters/kugar/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/kspread/qpro/Makefile.in
++++ filters/kspread/qpro/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libqproimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12724,16 +19126,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -601,7 +602,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -567,9 +570,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12743,11 +19145,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- filters/kugar/kugarnop/Makefile.in
+++ filters/kugar/kugarnop/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libkugarnopimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12757,7 +19174,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12766,7 +19183,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12778,9 +19195,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/Makefile.in
-+++ filters/kword/Makefile.in
-@@ -251,6 +251,9 @@
+--- filters/kugar/Makefile.in
++++ filters/kugar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12790,7 +19213,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12799,7 +19222,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12813,7 +19236,22 @@
mostlyclean-libtool:
--- filters/kword/abiword/Makefile.in
+++ filters/kword/abiword/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libabiwordexport_la_SOURCES) $(libabiwordimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12823,7 +19261,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12832,7 +19270,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12846,7 +19284,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/amipro/Makefile.in
+++ filters/kword/amipro/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libamiproexport_la_SOURCES) $(libamiproimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12856,7 +19309,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -12865,7 +19318,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12879,7 +19332,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/applixword/Makefile.in
+++ filters/kword/applixword/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libapplixwordimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12889,7 +19357,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12898,7 +19366,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12912,7 +19380,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/ascii/Makefile.in
+++ filters/kword/ascii/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libasciiexport_la_SOURCES) $(libasciiimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12922,7 +19405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12931,7 +19414,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12945,7 +19428,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/docbook/Makefile.in
+++ filters/kword/docbook/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libdocbookexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12955,7 +19453,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -12964,7 +19462,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12978,7 +19476,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/hancomword/Makefile.in
+++ filters/kword/hancomword/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libhancomwordimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12988,7 +19501,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12997,7 +19510,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13009,9 +19522,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/html/Makefile.in
-+++ filters/kword/html/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/kword/html/export/Makefile.in
++++ filters/kword/html/export/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libhtmlexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13021,16 +19549,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -594,7 +595,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -567,9 +570,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13040,11 +19568,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kword/html/import/Makefile.in
++++ filters/kword/html/import/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/kword/html/export/Makefile.in
-+++ filters/kword/html/export/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libhtmlimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13054,16 +19597,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -639,9 +642,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13075,9 +19618,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/html/import/Makefile.in
-+++ filters/kword/html/import/Makefile.in
-@@ -292,6 +292,9 @@
+--- filters/kword/html/Makefile.in
++++ filters/kword/html/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13087,16 +19636,64 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
+-$(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*) \
+@@ -572,9 +575,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
+
+ mostlyclean-libtool:
+--- filters/kword/kword1.3/import/Makefile.in
++++ filters/kword/kword1.3/import/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+ ####### General stuff
+
+-SOURCES = $(libkwordkword1dot3import_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
+ 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@
+@@ -588,7 +589,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*) \
-@@ -623,9 +626,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13110,6 +19707,12 @@
@$(NORMAL_INSTALL)
--- filters/kword/kword1.3/Makefile.in
+++ filters/kword/kword1.3/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -13120,7 +19723,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13129,7 +19732,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13141,9 +19744,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- filters/kword/kword1.3/import/Makefile.in
-+++ filters/kword/kword1.3/import/Makefile.in
-@@ -322,6 +322,9 @@
+--- filters/kword/latex/export/Makefile.in
++++ filters/kword/latex/export/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libkwordlatexexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13153,16 +19771,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -614,7 +615,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .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*) \
-@@ -655,9 +658,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13174,9 +19792,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/latex/Makefile.in
-+++ filters/kword/latex/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/kword/latex/import/generator/Makefile.in
++++ filters/kword/latex/import/generator/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(liblatexgenerator_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13186,16 +19819,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -579,7 +580,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -567,9 +570,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13205,11 +19838,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kword/latex/import/Makefile.in
++++ filters/kword/latex/import/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/kword/latex/export/Makefile.in
-+++ filters/kword/latex/export/Makefile.in
-@@ -341,6 +341,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkwordlateximport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13219,7 +19867,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -654,7 +657,7 @@
+@@ -613,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13228,7 +19876,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -692,9 +695,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13240,9 +19888,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/latex/import/Makefile.in
-+++ filters/kword/latex/import/Makefile.in
-@@ -304,6 +304,9 @@
+--- filters/kword/latex/import/parser/Makefile.in
++++ filters/kword/latex/import/parser/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(liblatexparser_la_SOURCES) $(texlauncher_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13252,7 +19915,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13261,7 +19924,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13273,9 +19936,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/latex/import/generator/Makefile.in
-+++ filters/kword/latex/import/generator/Makefile.in
-@@ -288,6 +288,9 @@
+--- filters/kword/latex/Makefile.in
++++ filters/kword/latex/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13285,16 +19954,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -616,9 +619,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13304,11 +19973,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- filters/kword/latex/import/parser/Makefile.in
-+++ filters/kword/latex/import/parser/Makefile.in
-@@ -308,6 +308,9 @@
+
+ mostlyclean-libtool:
+--- filters/kword/libexport/Makefile.in
++++ filters/kword/libexport/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libkwordexportfilters_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13318,7 +20002,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13327,7 +20011,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13337,11 +20021,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/libexport/Makefile.in
-+++ filters/kword/libexport/Makefile.in
-@@ -300,6 +300,9 @@
+--- filters/kword/Makefile.in
++++ filters/kword/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13351,16 +20041,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -540,7 +543,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -633,9 +636,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13370,11 +20060,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- filters/kword/msword/Makefile.in
+++ filters/kword/msword/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libmswordimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13384,7 +20089,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13393,7 +20098,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13407,7 +20112,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/mswrite/Makefile.in
+++ filters/kword/mswrite/Makefile.in
-@@ -323,6 +323,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libmswriteexport_la_SOURCES) $(libmswriteimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -305,6 +303,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13417,7 +20137,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -634,7 +637,7 @@
+@@ -621,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13426,7 +20146,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -672,9 +675,9 @@
+@@ -659,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13440,7 +20160,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/oowriter/Makefile.in
+++ filters/kword/oowriter/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libcommon_la_SOURCES) $(liboowriterexport_la_SOURCES) $(liboowriterimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -300,6 +298,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13450,7 +20185,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -607,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13459,7 +20194,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -645,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13473,7 +20208,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/palmdoc/Makefile.in
+++ filters/kword/palmdoc/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libpalmdocexport_la_SOURCES) $(libpalmdocimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13483,7 +20233,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13492,7 +20242,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13506,7 +20256,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/pdf/Makefile.in
+++ filters/kword/pdf/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libpdfimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13516,7 +20281,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13525,7 +20290,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13537,9 +20302,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/pdf/xpdf/Makefile.in
-+++ filters/kword/pdf/xpdf/Makefile.in
-@@ -250,6 +250,9 @@
+--- filters/kword/pdf/xpdf/goo/Makefile.in
++++ filters/kword/pdf/xpdf/goo/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libgoo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13549,16 +20329,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
- all: docs-am all-recursive
+@@ -568,7 +569,7 @@
.SUFFIXES:
+ .SUFFIXES: .c .cc .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*) \
-@@ -568,9 +571,9 @@
+@@ -606,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13569,10 +20349,16 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
---- filters/kword/pdf/xpdf/goo/Makefile.in
-+++ filters/kword/pdf/xpdf/goo/Makefile.in
-@@ -291,6 +291,9 @@
+ clean-noinstLTLIBRARIES:
+--- filters/kword/pdf/xpdf/Makefile.in
++++ filters/kword/pdf/xpdf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13582,16 +20368,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -535,7 +538,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .c .cc .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*) \
-@@ -614,9 +617,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13602,10 +20388,25 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
+ mostlyclean-libtool:
--- filters/kword/pdf/xpdf/xpdf/Makefile.in
+++ filters/kword/pdf/xpdf/xpdf/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libxpdf_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13615,7 +20416,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13624,7 +20425,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13636,9 +20437,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- filters/kword/rtf/Makefile.in
-+++ filters/kword/rtf/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/kword/rtf/export/Makefile.in
++++ filters/kword/rtf/export/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(librtfexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13648,16 +20464,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -585,7 +586,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -567,9 +570,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13667,11 +20483,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kword/rtf/import/Makefile.in
++++ filters/kword/rtf/import/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/kword/rtf/export/Makefile.in
-+++ filters/kword/rtf/export/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(librtfimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13681,16 +20512,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -618,9 +621,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13702,9 +20533,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/rtf/import/Makefile.in
-+++ filters/kword/rtf/import/Makefile.in
-@@ -291,6 +291,9 @@
+--- filters/kword/rtf/Makefile.in
++++ filters/kword/rtf/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13714,16 +20551,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -622,9 +625,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13733,11 +20570,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- filters/kword/starwriter/Makefile.in
+++ filters/kword/starwriter/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libstarwriterimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13747,7 +20599,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13756,7 +20608,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13770,7 +20622,22 @@
@$(NORMAL_INSTALL)
--- filters/kword/wml/Makefile.in
+++ filters/kword/wml/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libwmlexport_la_SOURCES) $(libwmlimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13780,7 +20647,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13789,7 +20656,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13801,9 +20668,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/wordperfect/Makefile.in
-+++ filters/kword/wordperfect/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/kword/wordperfect/export/Makefile.in
++++ filters/kword/wordperfect/export/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libwpexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13813,16 +20695,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
- all: docs-am all-recursive
+@@ -581,7 +582,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -568,9 +571,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13832,11 +20714,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- filters/kword/wordperfect/import/Makefile.in
++++ filters/kword/wordperfect/import/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- filters/kword/wordperfect/export/Makefile.in
-+++ filters/kword/wordperfect/export/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libwpimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13846,7 +20743,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13855,7 +20752,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13867,9 +20764,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/kword/wordperfect/import/Makefile.in
-+++ filters/kword/wordperfect/import/Makefile.in
-@@ -278,6 +278,9 @@
+--- filters/kword/wordperfect/Makefile.in
++++ filters/kword/wordperfect/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13879,16 +20782,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -535,7 +538,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -607,9 +610,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13898,11 +20801,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- filters/libdialogfilter/Makefile.in
+++ filters/libdialogfilter/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libdialogfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13912,7 +20830,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -554,7 +555,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13921,7 +20839,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -592,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13935,7 +20853,22 @@
clean-noinstLTLIBRARIES:
--- filters/liboofilter/Makefile.in
+++ filters/liboofilter/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(liboofilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -268,6 +266,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13945,7 +20878,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -556,7 +557,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -13954,7 +20887,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -594,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13966,9 +20899,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- filters/xsltfilter/Makefile.in
-+++ filters/xsltfilter/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/Makefile.in
++++ filters/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -252,6 +252,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13978,16 +20917,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -547,7 +550,7 @@
all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -585,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14001,7 +20940,22 @@
mostlyclean-libtool:
--- filters/xsltfilter/export/Makefile.in
+++ filters/xsltfilter/export/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libxsltexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14011,7 +20965,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14020,7 +20974,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14032,8 +20986,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- filters/xsltfilter/export/xsl/Makefile.in
-+++ filters/xsltfilter/export/xsl/Makefile.in
+--- filters/xsltfilter/export/xsl/kword/Makefile.in
++++ filters/xsltfilter/export/xsl/kword/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -14044,7 +21004,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14053,7 +21013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14065,9 +21025,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- filters/xsltfilter/export/xsl/kword/Makefile.in
-+++ filters/xsltfilter/export/xsl/kword/Makefile.in
-@@ -249,6 +249,9 @@
+--- filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
++++ filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14078,7 +21044,7 @@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -14098,9 +21064,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
-+++ filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
-@@ -237,6 +237,9 @@
+--- filters/xsltfilter/export/xsl/Makefile.in
++++ filters/xsltfilter/export/xsl/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14110,8 +21082,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
- all: docs-am all-am
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -14119,7 +21091,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14133,7 +21105,22 @@
mostlyclean-libtool:
--- filters/xsltfilter/import/Makefile.in
+++ filters/xsltfilter/import/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -19,8 +19,6 @@
+
+
+
+-SOURCES = $(libxsltimport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14143,7 +21130,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14152,7 +21139,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14164,9 +21151,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- interfaces/Makefile.in
-+++ interfaces/Makefile.in
-@@ -275,6 +275,9 @@
+--- filters/xsltfilter/Makefile.in
++++ filters/xsltfilter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14176,16 +21169,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+-$(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*) \
-@@ -602,9 +605,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14195,11 +21188,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- karbon/Makefile.in
-+++ karbon/Makefile.in
-@@ -377,6 +377,9 @@
+
+ mostlyclean-libtool:
+--- interfaces/Makefile.in
++++ interfaces/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkochart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14209,28 +21217,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -670,9 +673,9 @@
- #>- libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc
- #>+ 1
- libkarboncommon_la_SOURCES=karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_view.cc karbon_view_iface.cc karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc karbon_part_iface_skel.cc karbon_view_iface_skel.cc
--#>- libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
-+#>- libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined
- #>+ 1
--libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
-+libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED)
- libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
- dockers/libkarbondockers.la \
- widgets/libkarbonwidgets.la \
-@@ -713,7 +716,7 @@
+@@ -572,7 +573,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
+ .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -751,9 +754,9 @@
+@@ -610,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14240,11 +21236,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
--- karbon/commands/Makefile.in
+++ karbon/commands/Makefile.in
-@@ -342,6 +342,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkarboncommands_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14254,7 +21265,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -676,7 +679,7 @@
+@@ -620,7 +621,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14263,7 +21274,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -714,9 +717,9 @@
+@@ -658,9 +659,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14277,7 +21288,22 @@
clean-noinstLTLIBRARIES:
--- karbon/core/Makefile.in
+++ karbon/core/Makefile.in
-@@ -345,6 +345,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkarboncore_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14287,7 +21313,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -730,7 +733,7 @@
+@@ -674,7 +675,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14296,7 +21322,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -768,9 +771,9 @@
+@@ -712,9 +713,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14310,7 +21336,13 @@
clean-noinstLTLIBRARIES:
--- karbon/data/Makefile.in
+++ karbon/data/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14320,7 +21352,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14329,7 +21361,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14343,7 +21375,22 @@
mostlyclean-libtool:
--- karbon/dialogs/Makefile.in
+++ karbon/dialogs/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkarbondialogs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14353,7 +21400,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14362,7 +21409,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14376,7 +21423,22 @@
clean-noinstLTLIBRARIES:
--- karbon/dockers/Makefile.in
+++ karbon/dockers/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkarbondockers_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -275,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14386,7 +21448,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14395,7 +21457,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14407,9 +21469,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- karbon/pics/Makefile.in
-+++ karbon/pics/Makefile.in
-@@ -233,6 +233,9 @@
+--- karbon/Makefile.in
++++ karbon/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) $(libkarbonpart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) $(libkarbonpart_la_SOURCES) $(karbon_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -137,8 +133,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
++#>- $(libkarbonpart_la_SOURCES)
++#>+ 2
+ SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
+- $(libkarbonpart_la_SOURCES)
++ $(libkarbonpart_la_SOURCES) $(karbon_SOURCES)
+ #>- DIST_SOURCES = $(karbon_la_SOURCES) $(libkarboncommon_la_SOURCES) \
+ #>- $(libkarbonpart_la_SOURCES)
+ #>+ 2
+@@ -345,6 +344,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14419,16 +21511,28 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
- all: docs-am all-am
+@@ -643,9 +645,9 @@
+ #>- libkarboncommon_la_SOURCES = karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_part_iface.skel karbon_view.cc karbon_view_iface.cc karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc
+ #>+ 1
+ libkarboncommon_la_SOURCES=karbon_factory.cc karbon_resourceserver.cc karbon_part.cc karbon_part_iface.cc karbon_view.cc karbon_view_iface.cc karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc vtoolcontroller.cc vtool.cc karbon_part_iface_skel.cc karbon_view_iface_skel.cc
+-#>- libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
++#>- libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined
+ #>+ 1
+-libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
++libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(KDE_NO_UNDEFINED)
+ libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
+ dockers/libkarbondockers.la \
+ widgets/libkarbonwidgets.la \
+@@ -686,7 +688,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -724,9 +726,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14438,11 +21542,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- karbon/pics/Makefile.in
++++ karbon/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- karbon/plugins/Makefile.in
-+++ karbon/plugins/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14452,8 +21562,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -520,7 +523,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -14461,7 +21571,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -558,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14475,7 +21585,22 @@
mostlyclean-libtool:
--- karbon/plugins/flattenpath/Makefile.in
+++ karbon/plugins/flattenpath/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(karbon_flattenpathplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14485,7 +21610,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -575,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14494,7 +21619,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -613,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14508,7 +21633,22 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/imagetool/Makefile.in
+++ karbon/plugins/imagetool/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(karbon_imagetoolplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14518,7 +21658,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14527,7 +21667,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14541,7 +21681,22 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/insertknots/Makefile.in
+++ karbon/plugins/insertknots/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(karbon_insertknotsplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14551,7 +21706,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -575,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14560,7 +21715,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -613,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14572,9 +21727,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- karbon/plugins/Makefile.in
++++ karbon/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
+ 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@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(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*) \
+@@ -572,9 +575,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
+
+ mostlyclean-libtool:
--- karbon/plugins/roundcorners/Makefile.in
+++ karbon/plugins/roundcorners/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(karbon_roundcornersplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14584,7 +21793,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -575,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14593,7 +21802,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -613,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14607,7 +21816,22 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/shadoweffect/Makefile.in
+++ karbon/plugins/shadoweffect/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(karbon_shadoweffectplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14617,7 +21841,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14626,7 +21850,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14640,7 +21864,22 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/whirlpinch/Makefile.in
+++ karbon/plugins/whirlpinch/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(karbon_whirlpinchplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14650,7 +21889,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -575,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14659,7 +21898,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -613,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14673,7 +21912,22 @@
@$(NORMAL_INSTALL)
--- karbon/plugins/zoomtool/Makefile.in
+++ karbon/plugins/zoomtool/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(karbon_zoomtoolplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14683,7 +21937,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14692,7 +21946,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14706,7 +21960,22 @@
@$(NORMAL_INSTALL)
--- karbon/render/Makefile.in
+++ karbon/render/Makefile.in
-@@ -322,6 +322,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libvpainter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14716,7 +21985,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +638,7 @@
+@@ -615,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -14725,7 +21994,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +676,9 @@
+@@ -653,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14739,7 +22008,22 @@
clean-noinstLTLIBRARIES:
--- karbon/render/xrgbrender/Makefile.in
+++ karbon/render/xrgbrender/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkarbonxrgbrender_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14749,7 +22033,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -550,7 +551,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -14758,7 +22042,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -588,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14772,7 +22056,22 @@
clean-noinstLTLIBRARIES:
--- karbon/shapes/Makefile.in
+++ karbon/shapes/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkarbonshapes_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14782,7 +22081,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14791,7 +22090,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14803,9 +22102,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- karbon/templates/Makefile.in
-+++ karbon/templates/Makefile.in
-@@ -249,6 +249,9 @@
+--- karbon/templates/basic/Makefile.in
++++ karbon/templates/basic/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14815,8 +22120,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -535,7 +538,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -14824,7 +22129,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14836,9 +22141,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- karbon/templates/basic/Makefile.in
-+++ karbon/templates/basic/Makefile.in
-@@ -238,6 +238,9 @@
+--- karbon/templates/Makefile.in
++++ karbon/templates/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14848,8 +22159,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
- all: docs-am all-am
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -14857,7 +22168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14871,7 +22182,22 @@
mostlyclean-libtool:
--- karbon/tools/Makefile.in
+++ karbon/tools/Makefile.in
-@@ -348,6 +348,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(karbon_defaulttools_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14881,7 +22207,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -689,7 +692,7 @@
+@@ -643,7 +644,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14890,7 +22216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -727,9 +730,9 @@
+@@ -681,9 +682,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14904,7 +22230,22 @@
@$(NORMAL_INSTALL)
--- karbon/visitors/Makefile.in
+++ karbon/visitors/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkarbonvisitors_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14914,7 +22255,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14923,7 +22264,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14937,7 +22278,22 @@
clean-noinstLTLIBRARIES:
--- karbon/widgets/Makefile.in
+++ karbon/widgets/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkarbonwidgets_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14947,7 +22303,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -646,7 +649,7 @@
+@@ -614,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14956,7 +22312,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -684,9 +687,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14968,9 +22324,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kchart/Makefile.in
-+++ kchart/Makefile.in
-@@ -462,6 +462,9 @@
+--- kchart/kdchart/Makefile.in
++++ kchart/kdchart/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkdchart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -306,6 +304,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14980,16 +22351,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -859,7 +862,7 @@
+@@ -672,7 +673,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ .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*) \
-@@ -897,9 +900,9 @@
+@@ -710,9 +711,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14999,11 +22370,41 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kchart/kdchart/Makefile.in
-+++ kchart/kdchart/Makefile.in
-@@ -391,6 +391,9 @@
+--- kchart/Makefile.in
++++ kchart/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) $(libkchartpart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) $(libkchartpart_la_SOURCES) $(kchart_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -156,8 +152,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
++#>- $(libkchartpart_la_SOURCES)
++#>+ 2
+ SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
+- $(libkchartpart_la_SOURCES)
++ $(libkchartpart_la_SOURCES) $(kchart_SOURCES)
+ #>- DIST_SOURCES = $(kchart_la_SOURCES) $(libkchartcommon_la_SOURCES) \
+ #>- $(libkchartpart_la_SOURCES)
+ #>+ 2
+@@ -368,6 +367,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15013,16 +22414,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -752,7 +755,7 @@
+@@ -770,7 +772,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)
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -790,9 +793,9 @@
+@@ -808,9 +810,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15032,11 +22433,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
--- kchart/pics/Makefile.in
+++ kchart/pics/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15046,7 +22453,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -538,7 +541,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15055,7 +22462,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15069,7 +22476,13 @@
mostlyclean-libtool:
--- kchart/templates/Makefile.in
+++ kchart/templates/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15079,7 +22492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15088,7 +22501,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15100,9 +22513,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kchart/toolbar/Makefile.in
-+++ kchart/toolbar/Makefile.in
-@@ -249,6 +249,9 @@
+--- kchart/toolbar/crystalsvg/Makefile.in
++++ kchart/toolbar/crystalsvg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15112,8 +22531,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
- all: docs-am all-recursive
+@@ -519,7 +522,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -15121,7 +22540,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15133,8 +22552,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kchart/toolbar/crystalsvg/Makefile.in
-+++ kchart/toolbar/crystalsvg/Makefile.in
+--- kchart/toolbar/locolor/Makefile.in
++++ kchart/toolbar/locolor/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15145,7 +22570,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15154,7 +22579,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15166,9 +22591,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kchart/toolbar/locolor/Makefile.in
-+++ kchart/toolbar/locolor/Makefile.in
-@@ -233,6 +233,9 @@
+--- kchart/toolbar/Makefile.in
++++ kchart/toolbar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15178,8 +22609,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
- all: docs-am all-am
+@@ -536,7 +539,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -15187,7 +22618,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15201,7 +22632,22 @@
mostlyclean-libtool:
--- kdgantt/Makefile.in
+++ kdgantt/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkdgantt_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15211,7 +22657,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -660,7 +663,7 @@
+@@ -625,7 +626,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15220,7 +22666,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -698,9 +701,9 @@
+@@ -663,9 +664,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15232,41 +22678,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kexi/3rdparty/Makefile.in
-+++ kexi/3rdparty/Makefile.in
-@@ -249,6 +249,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@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(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*) \
-@@ -567,9 +570,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
-
- mostlyclean-libtool:
--- kexi/3rdparty/kexisql/Makefile.in
+++ kexi/3rdparty/kexisql/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15277,7 +22696,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15286,7 +22705,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15300,7 +22719,22 @@
mostlyclean-libtool:
--- kexi/3rdparty/kexisql/src/Makefile.in
+++ kexi/3rdparty/kexisql/src/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkexisql2_la_SOURCES) $(ksqlite2_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15310,7 +22744,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -15319,7 +22753,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15333,6 +22767,12 @@
@$(NORMAL_INSTALL)
--- kexi/3rdparty/kexisql/tool/Makefile.in
+++ kexi/3rdparty/kexisql/tool/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15343,7 +22783,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -517,7 +520,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15352,7 +22792,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -555,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15366,6 +22806,12 @@
mostlyclean-libtool:
--- kexi/3rdparty/kexisql3/Makefile.in
+++ kexi/3rdparty/kexisql3/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15376,7 +22822,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15385,7 +22831,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15399,7 +22845,22 @@
mostlyclean-libtool:
--- kexi/3rdparty/kexisql3/src/Makefile.in
+++ kexi/3rdparty/kexisql3/src/Makefile.in
-@@ -321,6 +321,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkexisql3_la_SOURCES) $(ksqlite_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15409,7 +22870,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -657,7 +660,7 @@
+@@ -638,7 +639,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -15418,7 +22879,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -695,9 +698,9 @@
+@@ -676,9 +677,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15432,7 +22893,22 @@
@$(NORMAL_INSTALL)
--- kexi/3rdparty/kolibs/Makefile.in
+++ kexi/3rdparty/kolibs/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkexikolibs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15442,7 +22918,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -636,7 +639,7 @@
+@@ -623,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -15451,7 +22927,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -674,9 +677,9 @@
+@@ -661,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15463,9 +22939,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kexi/3rdparty/uuid/Makefile.in
-+++ kexi/3rdparty/uuid/Makefile.in
-@@ -284,6 +284,9 @@
+--- kexi/3rdparty/Makefile.in
++++ kexi/3rdparty/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15475,16 +22957,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(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*) \
-@@ -617,9 +620,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15495,10 +22977,25 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
---- kexi/Makefile.in
-+++ kexi/Makefile.in
-@@ -305,6 +305,9 @@
+ mostlyclean-libtool:
+--- kexi/3rdparty/uuid/Makefile.in
++++ kexi/3rdparty/uuid/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkexiuuid_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -275,6 +273,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15508,16 +23005,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -639,7 +642,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ .SUFFIXES: .c .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -677,9 +680,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15527,11 +23024,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ clean-noinstLTLIBRARIES:
--- kexi/core/Makefile.in
+++ kexi/core/Makefile.in
-@@ -392,6 +392,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkexicore_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -316,6 +314,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15541,7 +23053,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -718,7 +721,7 @@
+@@ -653,7 +654,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15550,7 +23062,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -756,9 +759,9 @@
+@@ -691,9 +692,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15562,9 +23074,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/data/Makefile.in
-+++ kexi/data/Makefile.in
-@@ -259,6 +259,9 @@
+--- kexi/data/kde34compat/Makefile.in
++++ kexi/data/kde34compat/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15574,16 +23092,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
- all: docs-am all-recursive
+@@ -537,7 +540,7 @@
+ all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(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*) \
-@@ -628,9 +631,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15595,9 +23113,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kexi/data/kde34compat/Makefile.in
-+++ kexi/data/kde34compat/Makefile.in
-@@ -238,6 +238,9 @@
+--- kexi/data/Makefile.in
++++ kexi/data/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -267,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15607,16 +23131,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
- all: docs-am all-am
+@@ -609,7 +612,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -647,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15630,6 +23154,12 @@
mostlyclean-libtool:
--- kexi/examples/Makefile.in
+++ kexi/examples/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -15640,7 +23170,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -517,7 +520,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15649,7 +23179,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -555,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15661,9 +23191,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kexi/formeditor/Makefile.in
-+++ kexi/formeditor/Makefile.in
-@@ -359,6 +359,9 @@
+--- kexi/formeditor/factories/Makefile.in
++++ kexi/formeditor/factories/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kformdesigner_containers_la_SOURCES) $(kformdesigner_stdwidgets_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15673,7 +23218,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -677,7 +680,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15682,7 +23227,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -715,9 +718,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15692,11 +23237,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/formeditor/factories/Makefile.in
-+++ kexi/formeditor/factories/Makefile.in
-@@ -287,6 +287,9 @@
+--- kexi/formeditor/kdevelop_plugin/Makefile.in
++++ kexi/formeditor/kdevelop_plugin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkformdesigner_kdev_part_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15706,7 +23266,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15715,7 +23275,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15727,9 +23287,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/formeditor/kdevelop_plugin/Makefile.in
-+++ kexi/formeditor/kdevelop_plugin/Makefile.in
-@@ -279,6 +279,9 @@
+--- kexi/formeditor/Makefile.in
++++ kexi/formeditor/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkformdesigner_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -310,6 +308,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15739,7 +23314,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -639,7 +640,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15748,7 +23323,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -677,9 +678,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15758,11 +23333,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
--- kexi/formeditor/scripting/Makefile.in
+++ kexi/formeditor/scripting/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkformdesigner_scripting_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15772,7 +23362,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15781,7 +23371,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15795,7 +23385,22 @@
clean-noinstLTLIBRARIES:
--- kexi/formeditor/test/Makefile.in
+++ kexi/formeditor/test/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkformdesigner_part_la_SOURCES) $(kformdesigner_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -300,6 +298,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15805,7 +23410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -619,7 +622,7 @@
+@@ -631,7 +632,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15814,7 +23419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -657,9 +660,9 @@
+@@ -669,9 +670,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15826,9 +23431,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/kexidb/Makefile.in
-+++ kexi/kexidb/Makefile.in
-@@ -365,6 +365,9 @@
+--- kexi/kexidb/drivers/Makefile.in
++++ kexi/kexidb/drivers/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15838,16 +23449,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -680,7 +683,7 @@
+@@ -536,7 +539,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(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*) \
-@@ -718,9 +721,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15857,11 +23468,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kexi/kexidb/drivers/Makefile.in
-+++ kexi/kexidb/drivers/Makefile.in
-@@ -249,6 +249,9 @@
+
+ mostlyclean-libtool:
+--- kexi/kexidb/drivers/mySQL/Makefile.in
++++ kexi/kexidb/drivers/mySQL/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexidb_mysqldriver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15871,16 +23497,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
- all: docs-am all-recursive
+@@ -612,7 +613,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -650,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15890,11 +23516,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kexi/kexidb/drivers/odbc/Makefile.in
++++ kexi/kexidb/drivers/odbc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- kexi/kexidb/drivers/mySQL/Makefile.in
-+++ kexi/kexidb/drivers/mySQL/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexidb_odbcdriver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15904,7 +23545,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15913,7 +23554,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15925,9 +23566,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/kexidb/drivers/odbc/Makefile.in
-+++ kexi/kexidb/drivers/odbc/Makefile.in
-@@ -283,6 +283,9 @@
+--- kexi/kexidb/drivers/pqxx/Makefile.in
++++ kexi/kexidb/drivers/pqxx/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kexidb_pqxxsqldriver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15937,7 +23593,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -606,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15946,7 +23602,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -644,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15958,9 +23614,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/kexidb/drivers/pqxx/Makefile.in
-+++ kexi/kexidb/drivers/pqxx/Makefile.in
-@@ -302,6 +302,9 @@
+--- kexi/kexidb/drivers/sqlite/Makefile.in
++++ kexi/kexidb/drivers/sqlite/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexidb_sqlite3driver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15970,7 +23641,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -607,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15979,7 +23650,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -645,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15991,9 +23662,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/kexidb/drivers/sqlite/Makefile.in
-+++ kexi/kexidb/drivers/sqlite/Makefile.in
-@@ -300,6 +300,9 @@
+--- kexi/kexidb/drivers/sqlite2/Makefile.in
++++ kexi/kexidb/drivers/sqlite2/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexidb_sqlite2driver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16003,7 +23689,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -610,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16012,7 +23698,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -648,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16024,9 +23710,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/kexidb/drivers/sqlite2/Makefile.in
-+++ kexi/kexidb/drivers/sqlite2/Makefile.in
-@@ -295,6 +295,9 @@
+--- kexi/kexidb/Makefile.in
++++ kexi/kexidb/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkexidb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -315,6 +313,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16036,7 +23737,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -642,7 +643,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16045,7 +23746,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -680,9 +681,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16055,11 +23756,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
--- kexi/kexidb/parser/Makefile.in
+++ kexi/kexidb/parser/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkexidbparser_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16069,7 +23785,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16078,7 +23794,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16092,7 +23808,22 @@
@$(NORMAL_INSTALL)
--- kexi/kexiutils/Makefile.in
+++ kexi/kexiutils/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkexiutils_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16102,7 +23833,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16111,7 +23842,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16125,7 +23856,22 @@
@$(NORMAL_INSTALL)
--- kexi/main/Makefile.in
+++ kexi/main/Makefile.in
-@@ -325,6 +325,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkeximain_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -309,6 +307,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16135,7 +23881,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -649,7 +652,7 @@
+@@ -644,7 +645,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16144,7 +23890,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -687,9 +690,9 @@
+@@ -682,9 +683,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16158,7 +23904,22 @@
@$(NORMAL_INSTALL)
--- kexi/main/printing/Makefile.in
+++ kexi/main/printing/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkeximainprinting_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16168,7 +23929,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -626,7 +629,7 @@
+@@ -624,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16177,7 +23938,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -664,9 +667,9 @@
+@@ -662,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16191,7 +23952,22 @@
clean-noinstLTLIBRARIES:
--- kexi/main/startup/Makefile.in
+++ kexi/main/startup/Makefile.in
-@@ -322,6 +322,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkeximainstartup_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16201,7 +23977,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -662,7 +665,7 @@
+@@ -645,7 +646,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16210,7 +23986,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -700,9 +703,9 @@
+@@ -683,9 +684,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16222,9 +23998,85 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+--- kexi/Makefile.in
++++ kexi/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(kexi_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -103,7 +99,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kexi_la_SOURCES)
++#>- SOURCES = $(kexi_la_SOURCES)
++#>+ 1
++SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
+ #>- DIST_SOURCES = $(kexi_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kexi_la_SOURCES) $(kexi_SOURCES)
+@@ -309,6 +307,9 @@
+ 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@
+@@ -654,7 +655,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -692,9 +693,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
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kexi/migration/Makefile.in
+++ kexi/migration/Makefile.in
-@@ -323,6 +323,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+
+
+
+-SOURCES = $(libkeximigrate_la_SOURCES) $(keximigratetest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -318,6 +316,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16234,7 +24086,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -650,7 +653,7 @@
+@@ -656,7 +657,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16243,7 +24095,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -688,9 +691,9 @@
+@@ -694,9 +695,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16257,7 +24109,22 @@
@$(NORMAL_INSTALL)
--- kexi/migration/mysql/Makefile.in
+++ kexi/migration/mysql/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(keximigrate_mysql_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16267,7 +24134,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16276,7 +24143,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16290,7 +24157,22 @@
@$(NORMAL_INSTALL)
--- kexi/migration/pqxx/Makefile.in
+++ kexi/migration/pqxx/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(keximigrate_pqxx_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16300,7 +24182,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16309,7 +24191,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16323,7 +24205,22 @@
@$(NORMAL_INSTALL)
--- kexi/migration/txt/Makefile.in
+++ kexi/migration/txt/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(keximigrate_txtmigrate_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16333,7 +24230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16342,7 +24239,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16356,7 +24253,13 @@
@$(NORMAL_INSTALL)
--- kexi/pics/Makefile.in
+++ kexi/pics/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16366,7 +24269,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -568,7 +571,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16375,7 +24278,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -606,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16387,9 +24290,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kexi/plugins/Makefile.in
-+++ kexi/plugins/Makefile.in
-@@ -250,6 +250,9 @@
+--- kexi/plugins/forms/Makefile.in
++++ kexi/plugins/forms/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kexihandler_form_la_SOURCES) $(kformdesigner_kexidbwidgets_la_SOURCES) $(libkexiformutils_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -339,6 +337,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16399,16 +24317,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
- all: docs-am all-recursive
+@@ -686,7 +687,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -724,9 +725,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16418,11 +24336,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kexi/plugins/forms/widgets/Makefile.in
++++ kexi/plugins/forms/widgets/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- kexi/plugins/forms/Makefile.in
-+++ kexi/plugins/forms/Makefile.in
-@@ -371,6 +371,9 @@
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkexiformutilswidgets_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16432,16 +24365,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -708,7 +711,7 @@
+@@ -619,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../Makefile.common $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -746,9 +749,9 @@
+@@ -657,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16451,11 +24384,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kexi/plugins/forms/widgets/Makefile.in
-+++ kexi/plugins/forms/widgets/Makefile.in
-@@ -340,6 +340,9 @@
+
+ clean-noinstLTLIBRARIES:
+--- kexi/plugins/importexport/csv/Makefile.in
++++ kexi/plugins/importexport/csv/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexihandler_csv_importexport_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16465,16 +24413,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -654,7 +657,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -692,9 +695,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16484,10 +24432,16 @@
-$(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:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kexi/plugins/importexport/Makefile.in
+++ kexi/plugins/importexport/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -16498,7 +24452,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16507,7 +24461,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16519,9 +24473,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kexi/plugins/importexport/csv/Makefile.in
-+++ kexi/plugins/importexport/csv/Makefile.in
-@@ -298,6 +298,9 @@
+--- kexi/plugins/Makefile.in
++++ kexi/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16531,16 +24491,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -537,7 +540,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
+-$(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*) \
-@@ -640,9 +643,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16550,11 +24510,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- kexi/plugins/migration/Makefile.in
+++ kexi/plugins/migration/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexihandler_migration_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16564,7 +24539,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16573,7 +24548,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16587,7 +24562,22 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/queries/Makefile.in
+++ kexi/plugins/queries/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexihandler_query_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16597,7 +24587,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -616,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16606,7 +24596,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -654,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16620,7 +24610,22 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/relations/Makefile.in
+++ kexi/plugins/relations/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexihandler_relation_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16630,7 +24635,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16639,7 +24644,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16653,7 +24658,22 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/reports/Makefile.in
+++ kexi/plugins/reports/Makefile.in
-@@ -340,6 +340,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexihandler_report_la_SOURCES) $(kexireportwidgets_la_SOURCES) $(libkexireportutils_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -329,6 +327,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16663,7 +24683,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -669,7 +672,7 @@
+@@ -669,7 +670,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16672,7 +24692,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -707,9 +710,9 @@
+@@ -707,9 +708,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16684,9 +24704,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/plugins/scripting/Makefile.in
-+++ kexi/plugins/scripting/Makefile.in
-@@ -249,6 +249,9 @@
+--- kexi/plugins/scripting/kexiapp/Makefile.in
++++ kexi/plugins/scripting/kexiapp/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(krosskexiapp_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16696,16 +24731,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -613,7 +614,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16715,11 +24750,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kexi/plugins/scripting/kexidb/Makefile.in
++++ kexi/plugins/scripting/kexidb/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- kexi/plugins/scripting/kexiapp/Makefile.in
-+++ kexi/plugins/scripting/kexiapp/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(krosskexidb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -303,6 +301,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16729,7 +24779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -629,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16738,7 +24788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -667,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16750,9 +24800,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/plugins/scripting/kexidb/Makefile.in
-+++ kexi/plugins/scripting/kexidb/Makefile.in
-@@ -331,6 +331,9 @@
+--- kexi/plugins/scripting/kexiscripting/Makefile.in
++++ kexi/plugins/scripting/kexiscripting/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kexihandler_script_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -305,6 +303,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16762,16 +24827,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -646,7 +649,7 @@
+@@ -632,7 +633,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -684,9 +687,9 @@
+@@ -670,9 +671,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16783,9 +24848,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kexi/plugins/scripting/kexiscripting/Makefile.in
-+++ kexi/plugins/scripting/kexiscripting/Makefile.in
-@@ -308,6 +308,9 @@
+--- kexi/plugins/scripting/Makefile.in
++++ kexi/plugins/scripting/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16795,16 +24866,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(srcdir)/../../Makefile.common $(am__configure_deps)
+-$(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*) \
-@@ -666,9 +669,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16814,11 +24885,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kexi/plugins/scripting/scripts/Makefile.in
-+++ kexi/plugins/scripting/scripts/Makefile.in
-@@ -249,6 +249,9 @@
+
+ mostlyclean-libtool:
+--- kexi/plugins/scripting/scripts/copycenter/Makefile.in
++++ kexi/plugins/scripting/scripts/copycenter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -238,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16828,16 +24905,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -539,7 +542,7 @@
+ all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16847,10 +24924,16 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-scriptsSCRIPTS: $(scripts_SCRIPTS)
+ @$(NORMAL_INSTALL)
--- kexi/plugins/scripting/scripts/exportxhtml/Makefile.in
+++ kexi/plugins/scripting/scripts/exportxhtml/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -238,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -16861,7 +24944,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16870,7 +24953,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16884,6 +24967,12 @@
@$(NORMAL_INSTALL)
--- kexi/plugins/scripting/scripts/importxhtml/Makefile.in
+++ kexi/plugins/scripting/scripts/importxhtml/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -238,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -16894,7 +24983,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16903,7 +24992,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16915,9 +25004,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-scriptsSCRIPTS: $(scripts_SCRIPTS)
@$(NORMAL_INSTALL)
---- kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
-+++ kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
-@@ -238,6 +238,9 @@
+--- kexi/plugins/scripting/scripts/Makefile.in
++++ kexi/plugins/scripting/scripts/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16927,16 +25022,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
- all: docs-am all-am
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+-$(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*) \
-@@ -566,9 +569,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16946,11 +25041,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-scriptsSCRIPTS: $(scripts_SCRIPTS)
- @$(NORMAL_INSTALL)
---- kexi/plugins/scripting/scripts/python/Makefile.in
-+++ kexi/plugins/scripting/scripts/python/Makefile.in
-@@ -250,6 +250,9 @@
+
+ mostlyclean-libtool:
+--- kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
++++ kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -238,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16961,7 +25062,7 @@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
@@ -539,7 +542,7 @@
- all: docs-am all-recursive
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
@@ -16979,10 +25080,16 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-scriptsSCRIPTS: $(scripts_SCRIPTS)
+ @$(NORMAL_INSTALL)
--- kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in
+++ kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -237,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -16993,7 +25100,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -523,7 +526,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17002,7 +25109,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -561,9 +564,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17014,9 +25121,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kexiapppythonSCRIPTS: $(kexiapppython_SCRIPTS)
@$(NORMAL_INSTALL)
+--- kexi/plugins/scripting/scripts/python/Makefile.in
++++ kexi/plugins/scripting/scripts/python/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -250,6 +250,9 @@
+ 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@
+@@ -550,7 +553,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -588,9 +591,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
+
+ mostlyclean-libtool:
--- kexi/plugins/tables/Makefile.in
+++ kexi/plugins/tables/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kexihandler_table_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17026,7 +25187,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17035,7 +25196,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17049,6 +25210,12 @@
@$(NORMAL_INSTALL)
--- kexi/tests/Makefile.in
+++ kexi/tests/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -17059,7 +25226,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17068,7 +25235,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17082,7 +25249,22 @@
mostlyclean-libtool:
--- kexi/tests/newapi/Makefile.in
+++ kexi/tests/newapi/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(kexidbtest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17092,7 +25274,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17101,7 +25283,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17115,7 +25297,22 @@
clean-noinstPROGRAMS:
--- kexi/tests/parser/Makefile.in
+++ kexi/tests/parser/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(kexidbparser_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17125,7 +25322,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17134,7 +25331,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17148,7 +25345,22 @@
@$(NORMAL_INSTALL)
--- kexi/tests/startup/Makefile.in
+++ kexi/tests/startup/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(kexistartuptest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17158,7 +25370,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17167,7 +25379,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17181,7 +25393,22 @@
@$(NORMAL_INSTALL)
--- kexi/tests/tableview/Makefile.in
+++ kexi/tests/tableview/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(kexitableviewtest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17191,7 +25418,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17200,7 +25427,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17214,7 +25441,22 @@
@$(NORMAL_INSTALL)
--- kexi/tests/widgets/Makefile.in
+++ kexi/tests/widgets/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(kexidbdrivercombotest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17224,7 +25466,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17233,7 +25475,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17247,7 +25489,22 @@
clean-noinstPROGRAMS:
--- kexi/widget/Makefile.in
+++ kexi/widget/Makefile.in
-@@ -360,6 +360,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkexiextendedwidgets_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -311,6 +309,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17257,7 +25514,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -705,7 +708,7 @@
+@@ -667,7 +668,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17266,7 +25523,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -743,9 +746,9 @@
+@@ -705,9 +706,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17280,7 +25537,22 @@
@$(NORMAL_INSTALL)
--- kexi/widget/relations/Makefile.in
+++ kexi/widget/relations/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkexirelationsview_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17290,7 +25562,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -625,7 +628,7 @@
+@@ -629,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17299,7 +25571,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -663,9 +666,9 @@
+@@ -667,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17313,7 +25585,22 @@
@$(NORMAL_INSTALL)
--- kexi/widget/tableview/Makefile.in
+++ kexi/widget/tableview/Makefile.in
-@@ -358,6 +358,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkexidatatable_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -312,6 +310,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17323,7 +25610,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -690,7 +693,7 @@
+@@ -655,7 +656,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17332,7 +25619,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -728,9 +731,9 @@
+@@ -693,9 +694,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17346,7 +25633,22 @@
@$(NORMAL_INSTALL)
--- kexi/widget/utils/Makefile.in
+++ kexi/widget/utils/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkexiguiutils_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17356,7 +25658,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -611,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17365,7 +25667,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -649,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17379,7 +25681,35 @@
@$(NORMAL_INSTALL)
--- kformula/Makefile.in
+++ kformula/Makefile.in
-@@ -348,6 +348,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES) $(kformula_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -123,7 +119,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES)
++#>- SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES)
++#>+ 1
++SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES) $(kformula_SOURCES)
+ #>- DIST_SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kformula_la_SOURCES) $(libkformulapart_la_SOURCES) $(kformula_SOURCES)
+@@ -333,6 +331,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17389,7 +25719,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -663,7 +666,7 @@
+@@ -653,7 +654,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -17398,7 +25728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -701,9 +704,9 @@
+@@ -691,9 +692,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17412,6 +25742,12 @@
@$(NORMAL_INSTALL)
--- kformula/pics/Makefile.in
+++ kformula/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -17422,7 +25758,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -518,7 +521,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17431,7 +25767,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17443,42 +25779,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kivio/Makefile.in
-+++ kivio/Makefile.in
-@@ -250,6 +250,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@
-@@ -530,7 +533,7 @@
- all: docs-am all-recursive
+--- kivio/kiviopart/config/Makefile.in
++++ kivio/kiviopart/config/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -568,9 +571,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -17,8 +17,6 @@
--$(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
- mostlyclean-libtool:
---- kivio/kiviopart/Makefile.in
-+++ kivio/kiviopart/Makefile.in
-@@ -447,6 +447,9 @@
+
+-SOURCES = $(libkivioconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17488,16 +25806,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -795,7 +798,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
+ .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*) \
-@@ -833,9 +836,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17507,11 +25825,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kivio/kiviopart/config/Makefile.in
-+++ kivio/kiviopart/config/Makefile.in
-@@ -279,6 +279,9 @@
+
+ clean-noinstLTLIBRARIES:
+--- kivio/kiviopart/kiviosdk/Makefile.in
++++ kivio/kiviopart/kiviosdk/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkiviosdk_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17521,7 +25854,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -622,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17530,7 +25863,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -660,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17542,9 +25875,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kivio/kiviopart/kiviosdk/Makefile.in
-+++ kivio/kiviopart/kiviosdk/Makefile.in
-@@ -361,6 +361,9 @@
+--- kivio/kiviopart/Makefile.in
++++ kivio/kiviopart/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) $(libkiviopart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) $(libkiviopart_la_SOURCES) $(kivio_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -150,8 +146,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
++#>- $(libkiviopart_la_SOURCES)
++#>+ 2
+ SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
+- $(libkiviopart_la_SOURCES)
++ $(libkiviopart_la_SOURCES) $(kivio_SOURCES)
+ #>- DIST_SOURCES = $(kivio_la_SOURCES) $(libkiviocommon_la_SOURCES) \
+ #>- $(libkiviopart_la_SOURCES)
+ #>+ 2
+@@ -362,6 +361,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17554,16 +25917,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -684,7 +687,7 @@
+@@ -715,7 +717,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .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*) \
-@@ -722,9 +725,9 @@
+@@ -753,9 +755,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17573,10 +25936,16 @@
-$(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:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kivio/kiviopart/pics/Makefile.in
+++ kivio/kiviopart/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -17587,7 +25956,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17596,7 +25965,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17610,7 +25979,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Assorted/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Assorted/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17620,7 +25995,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -616,7 +619,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17629,7 +26004,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -654,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17643,7 +26018,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Circuit/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Circuit/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17653,7 +26034,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -596,7 +599,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17662,7 +26043,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17676,7 +26057,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Cisco/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Cisco/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17686,7 +26073,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -967,7 +970,7 @@
+@@ -978,7 +981,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17695,7 +26082,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -1005,9 +1008,9 @@
+@@ -1016,9 +1019,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17709,7 +26096,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Civil/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Civil/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17719,7 +26112,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -588,7 +591,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17728,7 +26121,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -626,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17742,7 +26135,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Contact/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Contact/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17752,7 +26151,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -568,7 +571,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17761,7 +26160,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -606,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17775,7 +26174,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Electric/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Electric/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17785,7 +26190,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -552,7 +555,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17794,7 +26199,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17808,7 +26213,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17818,7 +26229,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -568,7 +571,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17827,7 +26238,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -606,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17839,9 +26250,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kivio/kiviopart/stencils/Dia/MSE/Makefile.in
-+++ kivio/kiviopart/stencils/Dia/MSE/Makefile.in
-@@ -237,6 +237,9 @@
+--- kivio/kiviopart/stencils/Dia/Makefile.in
++++ kivio/kiviopart/stencils/Dia/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17851,8 +26268,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
- all: docs-am all-am
+@@ -549,7 +552,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -17860,7 +26277,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -587,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17872,9 +26289,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kivio/kiviopart/stencils/Dia/Makefile.in
-+++ kivio/kiviopart/stencils/Dia/Makefile.in
-@@ -253,6 +253,9 @@
+--- kivio/kiviopart/stencils/Dia/MSE/Makefile.in
++++ kivio/kiviopart/stencils/Dia/MSE/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17884,8 +26307,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
- all: docs-am all-recursive
+@@ -548,7 +551,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -17893,7 +26316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -586,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17907,7 +26330,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Network/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Network/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17917,7 +26346,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -598,7 +601,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17926,7 +26355,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17940,7 +26369,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17950,7 +26385,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -576,7 +579,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17959,7 +26394,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17973,7 +26408,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/SDL/Makefile.in
+++ kivio/kiviopart/stencils/Dia/SDL/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17983,7 +26424,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -570,7 +573,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17992,7 +26433,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -608,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18006,7 +26447,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Dia/Sybase/Makefile.in
+++ kivio/kiviopart/stencils/Dia/Sybase/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18016,7 +26463,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -548,7 +551,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18025,7 +26472,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -586,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18039,7 +26486,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in
+++ kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18049,7 +26502,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -571,7 +574,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18058,7 +26511,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18072,7 +26525,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in
+++ kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18082,7 +26541,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18091,7 +26550,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18105,7 +26564,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in
+++ kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18115,7 +26580,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -551,7 +554,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18124,7 +26589,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -589,9 +592,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18138,7 +26603,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Flowcharting/Makefile.in
+++ kivio/kiviopart/stencils/Flowcharting/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18148,7 +26619,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -546,7 +549,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18157,7 +26628,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -584,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18171,7 +26642,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Geographic/Flags/Makefile.in
+++ kivio/kiviopart/stencils/Geographic/Flags/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18181,7 +26658,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -568,7 +571,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18190,7 +26667,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -606,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18204,7 +26681,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Geographic/Makefile.in
+++ kivio/kiviopart/stencils/Geographic/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18214,7 +26697,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -546,7 +549,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18223,7 +26706,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -584,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18237,7 +26720,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Geographic/Maps/Makefile.in
+++ kivio/kiviopart/stencils/Geographic/Maps/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18247,7 +26736,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18256,7 +26745,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18270,7 +26759,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Hardware/Computer/Makefile.in
+++ kivio/kiviopart/stencils/Hardware/Computer/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18280,7 +26775,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -564,7 +567,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18289,7 +26784,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -602,9 +605,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18303,7 +26798,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Hardware/Makefile.in
+++ kivio/kiviopart/stencils/Hardware/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18313,7 +26814,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -546,7 +549,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18322,7 +26823,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -584,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18336,7 +26837,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in
+++ kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18346,7 +26853,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -538,7 +541,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18355,7 +26862,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18369,6 +26876,12 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Makefile.in
+++ kivio/kiviopart/stencils/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -18379,7 +26892,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18388,7 +26901,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18402,7 +26915,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18412,7 +26931,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18421,7 +26940,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18435,7 +26954,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18445,7 +26970,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18454,7 +26979,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18468,7 +26993,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/ER/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/ER/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18478,7 +27009,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -531,7 +534,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18487,7 +27018,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18501,7 +27032,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18511,7 +27048,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -546,7 +549,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18520,7 +27057,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -584,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18534,7 +27071,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18544,7 +27087,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18553,7 +27096,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18567,7 +27110,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18577,7 +27126,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -548,7 +551,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18586,7 +27135,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -586,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18600,7 +27149,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in
+++ kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18610,7 +27165,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18619,7 +27174,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18633,7 +27188,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in
+++ kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18643,7 +27204,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18652,7 +27213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18666,7 +27227,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in
+++ kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18676,7 +27243,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18685,7 +27252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18699,7 +27266,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/stencils/UML/Makefile.in
+++ kivio/kiviopart/stencils/UML/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18709,7 +27282,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -550,7 +553,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18718,7 +27291,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -588,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18732,7 +27305,13 @@
mostlyclean-libtool:
--- kivio/kiviopart/tiles/Makefile.in
+++ kivio/kiviopart/tiles/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -248,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18742,7 +27321,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18751,7 +27330,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18765,7 +27344,22 @@
mostlyclean-libtool:
--- kivio/kiviopart/tools/Makefile.in
+++ kivio/kiviopart/tools/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libtools_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18775,7 +27369,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18784,7 +27378,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18798,7 +27392,22 @@
clean-noinstLTLIBRARIES:
--- kivio/kiviopart/ui/Makefile.in
+++ kivio/kiviopart/ui/Makefile.in
-@@ -323,6 +323,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18808,7 +27417,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18817,7 +27426,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -668,9 +671,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18829,9 +27438,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- kivio/plugins/Makefile.in
-+++ kivio/plugins/Makefile.in
-@@ -249,6 +249,9 @@
+--- kivio/Makefile.in
++++ kivio/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18841,16 +27456,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-recursive
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18864,7 +27479,22 @@
mostlyclean-libtool:
--- kivio/plugins/kivioconnectortool/Makefile.in
+++ kivio/plugins/kivioconnectortool/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkivioconnectortool_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -300,6 +298,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18874,7 +27504,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -622,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18883,7 +27513,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -660,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18897,7 +27527,22 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kivioconnectortool/straight_connector/Makefile.in
+++ kivio/plugins/kivioconnectortool/straight_connector/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(straight_connector_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18907,7 +27552,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18916,7 +27561,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18930,7 +27575,22 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kivioselecttool/Makefile.in
+++ kivio/plugins/kivioselecttool/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkivioselecttool_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18940,7 +27600,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -611,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18949,7 +27609,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -649,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18963,7 +27623,13 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kivioselecttool/select_pics/Makefile.in
+++ kivio/plugins/kivioselecttool/select_pics/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -248,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18973,7 +27639,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18982,7 +27648,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18996,7 +27662,22 @@
mostlyclean-libtool:
--- kivio/plugins/kiviosmlconnector/Makefile.in
+++ kivio/plugins/kiviosmlconnector/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkiviosmlconnector_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19006,7 +27687,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19015,7 +27696,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19029,7 +27710,22 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in
+++ kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(sml_connector_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19039,7 +27735,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19048,7 +27744,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19062,7 +27758,22 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviotargettool/Makefile.in
+++ kivio/plugins/kiviotargettool/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkiviotargettool_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19072,7 +27783,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19081,7 +27792,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19095,7 +27806,22 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviotexttool/Makefile.in
+++ kivio/plugins/kiviotexttool/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkiviotexttool_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19105,7 +27831,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -613,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19114,7 +27840,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19128,7 +27854,22 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviozoomtool/Makefile.in
+++ kivio/plugins/kiviozoomtool/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkiviozoomtool_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19138,7 +27879,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -611,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19147,7 +27888,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -649,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19161,7 +27902,13 @@
@$(NORMAL_INSTALL)
--- kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in
+++ kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -248,6 +248,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19171,7 +27918,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -545,7 +548,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19180,7 +27927,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -583,9 +586,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19192,8 +27939,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kivio/templates/Makefile.in
-+++ kivio/templates/Makefile.in
+--- kivio/plugins/Makefile.in
++++ kivio/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -19204,7 +27957,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19213,7 +27966,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19227,7 +27980,13 @@
mostlyclean-libtool:
--- kivio/templates/basic/Makefile.in
+++ kivio/templates/basic/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19237,7 +27996,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19246,7 +28005,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19258,9 +28017,76 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+--- kivio/templates/Makefile.in
++++ kivio/templates/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
+ 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@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(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*) \
+@@ -572,9 +575,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
+
+ mostlyclean-libtool:
--- koshell/Makefile.in
+++ koshell/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(koshell_la_SOURCES)
+-#>+ 1
+-SOURCES = $(koshell_la_SOURCES) $(koshell_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -105,7 +101,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(koshell_la_SOURCES)
++#>- SOURCES = $(koshell_la_SOURCES)
++#>+ 1
++SOURCES = $(koshell_la_SOURCES) $(koshell_SOURCES)
+ #>- DIST_SOURCES = $(koshell_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(koshell_la_SOURCES) $(koshell_SOURCES)
+@@ -299,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19270,7 +28096,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -19279,7 +28105,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19293,7 +28119,22 @@
@$(NORMAL_INSTALL)
--- kounavail/Makefile.in
+++ kounavail/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkounavailpart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19303,7 +28144,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -575,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19312,7 +28153,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -613,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19326,7 +28167,35 @@
@$(NORMAL_INSTALL)
--- kplato/Makefile.in
+++ kplato/Makefile.in
-@@ -547,6 +547,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES) $(kplato_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -161,7 +157,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES)
++#>- SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES)
++#>+ 1
++SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES) $(kplato_SOURCES)
+ #>- DIST_SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kplato_la_SOURCES) $(libkplatopart_la_SOURCES) $(kplato_SOURCES)
+@@ -370,6 +368,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19336,7 +28205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -995,7 +998,7 @@
+@@ -823,7 +824,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19345,7 +28214,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -1033,9 +1036,9 @@
+@@ -861,9 +862,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19359,6 +28228,12 @@
@$(NORMAL_INSTALL)
--- kplato/pics/Makefile.in
+++ kplato/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -19369,7 +28244,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -518,7 +521,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19378,7 +28253,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19392,7 +28267,13 @@
mostlyclean-libtool:
--- kplato/reports/Makefile.in
+++ kplato/reports/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19402,7 +28283,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19411,7 +28292,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -560,9 +563,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19425,6 +28306,12 @@
mostlyclean-libtool:
--- kplato/templates/Makefile.in
+++ kplato/templates/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -19435,7 +28322,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19444,7 +28331,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19458,7 +28345,13 @@
mostlyclean-libtool:
--- kplato/templates/Simple/Makefile.in
+++ kplato/templates/Simple/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19468,7 +28361,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19477,7 +28370,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19491,7 +28384,22 @@
mostlyclean-libtool:
--- kplato/tests/Makefile.in
+++ kplato/tests/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_CalendarTester_la_SOURCES) $(kunittest_DateTimeTester_la_SOURCES) $(kunittest_DurationTester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19501,7 +28409,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19510,7 +28418,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19524,6 +28432,12 @@
clean-checkLTLIBRARIES:
--- kplato/toolbar/Makefile.in
+++ kplato/toolbar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -19534,7 +28448,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19543,7 +28457,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19555,42 +28469,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/Makefile.in
-+++ kpresenter/Makefile.in
-@@ -673,6 +673,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@
-@@ -1107,7 +1110,7 @@
+--- kpresenter/autoformEdit/Makefile.in
++++ kpresenter/autoformEdit/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -1145,9 +1148,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -17,8 +17,6 @@
--$(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
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kpresenter/autoformEdit/Makefile.in
-+++ kpresenter/autoformEdit/Makefile.in
-@@ -277,6 +277,9 @@
+ ####### General stuff
+
+-SOURCES = $(libaf_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19600,7 +28496,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -561,7 +562,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19609,7 +28505,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -599,9 +600,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19623,7 +28519,13 @@
clean-noinstLTLIBRARIES:
--- kpresenter/autoforms/Arrows/Makefile.in
+++ kpresenter/autoforms/Arrows/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19633,7 +28535,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -548,7 +551,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19642,7 +28544,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -586,9 +589,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19656,7 +28558,13 @@
mostlyclean-libtool:
--- kpresenter/autoforms/Connections/Makefile.in
+++ kpresenter/autoforms/Connections/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -246,6 +246,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19666,7 +28574,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -554,7 +557,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19675,7 +28583,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -592,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19689,7 +28597,13 @@
mostlyclean-libtool:
--- kpresenter/autoforms/Makefile.in
+++ kpresenter/autoforms/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19699,7 +28613,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -546,7 +549,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19708,7 +28622,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -584,9 +587,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19722,7 +28636,13 @@
mostlyclean-libtool:
--- kpresenter/dtd/Makefile.in
+++ kpresenter/dtd/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19732,7 +28652,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19741,7 +28661,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19753,9 +28673,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/pics/Makefile.in
-+++ kpresenter/pics/Makefile.in
-@@ -253,6 +253,9 @@
+--- kpresenter/Makefile.in
++++ kpresenter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) $(libkpresenterprivate_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) $(libkpresenterprivate_la_SOURCES) $(kpresenter_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -193,8 +189,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) \
++#>- $(libkpresenterprivate_la_SOURCES)
++#>+ 2
+ SOURCES = $(kpresenter_la_SOURCES) $(libkpresenterpart_la_SOURCES) \
+- $(libkpresenterprivate_la_SOURCES)
++ $(libkpresenterprivate_la_SOURCES) $(kpresenter_SOURCES)
+ #>- DIST_SOURCES = $(kpresenter_la_SOURCES) \
+ #>- $(libkpresenterpart_la_SOURCES) \
+ #>- $(libkpresenterprivate_la_SOURCES)
+@@ -406,6 +405,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19765,16 +28715,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
- all: docs-am all-recursive
+@@ -845,7 +847,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -883,9 +885,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19784,11 +28734,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kpresenter/pics/Makefile.in
++++ kpresenter/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- kpresenter/pics/rotate/Makefile.in
-+++ kpresenter/pics/rotate/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19798,8 +28754,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
- all: docs-am all-am
+@@ -547,7 +550,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -19807,7 +28763,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -585,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19819,9 +28775,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/slideshow/Makefile.in
-+++ kpresenter/slideshow/Makefile.in
-@@ -237,6 +237,9 @@
+--- kpresenter/pics/rotate/Makefile.in
++++ kpresenter/pics/rotate/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19831,7 +28793,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -531,7 +534,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19840,7 +28802,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19852,9 +28814,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/A4/Makefile.in
-+++ kpresenter/templates/A4/Makefile.in
-@@ -237,6 +237,9 @@
+--- kpresenter/slideshow/Makefile.in
++++ kpresenter/slideshow/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19864,7 +28832,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19873,7 +28841,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19885,9 +28853,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/Makefile.in
-+++ kpresenter/templates/Makefile.in
-@@ -249,6 +249,9 @@
+--- kpresenter/templates/A4/Makefile.in
++++ kpresenter/templates/A4/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19897,8 +28871,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -538,7 +541,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -19906,7 +28880,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19918,9 +28892,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/Screen/Makefile.in
-+++ kpresenter/templates/Screen/Makefile.in
-@@ -237,6 +237,9 @@
+--- kpresenter/templates/common_icon/Makefile.in
++++ kpresenter/templates/common_icon/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19930,7 +28910,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19939,7 +28919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19951,9 +28931,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/Screenpresentations/Makefile.in
-+++ kpresenter/templates/Screenpresentations/Makefile.in
-@@ -238,6 +238,9 @@
+--- kpresenter/templates/legal/Makefile.in
++++ kpresenter/templates/legal/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19963,7 +28949,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -538,7 +541,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19972,7 +28958,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19984,9 +28970,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/common_icon/Makefile.in
-+++ kpresenter/templates/common_icon/Makefile.in
-@@ -233,6 +233,9 @@
+--- kpresenter/templates/letter/Makefile.in
++++ kpresenter/templates/letter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19996,7 +28988,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -538,7 +541,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20005,7 +28997,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20017,9 +29009,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/legal/Makefile.in
-+++ kpresenter/templates/legal/Makefile.in
-@@ -237,6 +237,9 @@
+--- kpresenter/templates/Makefile.in
++++ kpresenter/templates/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20029,8 +29027,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
- all: docs-am all-am
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -20038,7 +29036,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20050,9 +29048,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/templates/letter/Makefile.in
-+++ kpresenter/templates/letter/Makefile.in
-@@ -237,6 +237,9 @@
+--- kpresenter/templates/Screen/Makefile.in
++++ kpresenter/templates/Screen/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20062,7 +29066,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20071,7 +29075,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20083,9 +29087,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kpresenter/toolbar/Makefile.in
-+++ kpresenter/toolbar/Makefile.in
-@@ -233,6 +233,9 @@
+--- kpresenter/templates/Screenpresentations/Makefile.in
++++ kpresenter/templates/Screenpresentations/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20095,7 +29105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -544,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20104,7 +29114,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -582,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20116,42 +29126,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/Makefile.in
-+++ krita/Makefile.in
-@@ -330,6 +330,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@
-@@ -637,7 +640,7 @@
+--- kpresenter/toolbar/Makefile.in
++++ kpresenter/toolbar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- .SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -675,9 +678,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
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- krita/colorspaces/Makefile.in
-+++ krita/colorspaces/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20161,8 +29144,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
- all: docs-am all-recursive
+@@ -519,7 +522,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -20170,7 +29153,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20184,7 +29167,22 @@
mostlyclean-libtool:
--- krita/colorspaces/cmyk_u16/Makefile.in
+++ krita/colorspaces/cmyk_u16/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(krita_cmyk_u16_plugin_la_SOURCES) $(libkrita_cmyk_u16_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -304,6 +302,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20194,7 +29192,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -612,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20203,7 +29201,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -650,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20217,7 +29215,22 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/cmyk_u8/Makefile.in
+++ krita/colorspaces/cmyk_u8/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritacmykplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20227,7 +29240,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20236,7 +29249,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20250,7 +29263,13 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/cmyk_u8/templates/Makefile.in
+++ krita/colorspaces/cmyk_u8/templates/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20260,7 +29279,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20269,7 +29288,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20283,7 +29302,22 @@
mostlyclean-libtool:
--- krita/colorspaces/gray_u16/Makefile.in
+++ krita/colorspaces/gray_u16/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(krita_gray_u16_plugin_la_SOURCES) $(libkrita_gray_u16_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -304,6 +302,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20293,7 +29327,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -613,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20302,7 +29336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20316,7 +29350,22 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/gray_u8/Makefile.in
+++ krita/colorspaces/gray_u8/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritagrayplugin_la_SOURCES) $(libkritagrayscale_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -303,6 +301,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20326,7 +29375,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20335,7 +29384,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20349,7 +29398,13 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/gray_u8/templates/Makefile.in
+++ krita/colorspaces/gray_u8/templates/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20359,7 +29414,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20368,7 +29423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20382,7 +29437,22 @@
mostlyclean-libtool:
--- krita/colorspaces/gray_u8/tests/Makefile.in
+++ krita/colorspaces/gray_u8/tests/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_kis_strategy_colorspace_grayscale_tester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20392,7 +29462,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -563,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20401,7 +29471,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -601,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20415,7 +29485,22 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/lms_f32/Makefile.in
+++ krita/colorspaces/lms_f32/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(krita_lms_f32_plugin_la_SOURCES) $(libkrita_lms_f32_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20425,7 +29510,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20434,7 +29519,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20446,9 +29531,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- krita/colorspaces/Makefile.in
++++ krita/colorspaces/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -252,6 +252,9 @@
+ 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@
+@@ -544,7 +547,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(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*) \
+@@ -582,9 +585,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
+
+ mostlyclean-libtool:
--- krita/colorspaces/rgb_f16half/Makefile.in
+++ krita/colorspaces/rgb_f16half/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(krita_rgb_f16half_plugin_la_SOURCES) $(libkrita_rgb_f16half_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -306,6 +304,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20458,7 +29597,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -618,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20467,7 +29606,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -656,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20481,7 +29620,22 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/rgb_f16half/tests/Makefile.in
+++ krita/colorspaces/rgb_f16half/tests/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20491,7 +29645,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -567,7 +568,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20500,7 +29654,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -605,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20514,7 +29668,22 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/rgb_f32/Makefile.in
+++ krita/colorspaces/rgb_f32/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(krita_rgb_f32_plugin_la_SOURCES) $(libkrita_rgb_f32_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -304,6 +302,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20524,7 +29693,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -615,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20533,7 +29702,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -653,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20547,7 +29716,22 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/rgb_f32/tests/Makefile.in
+++ krita/colorspaces/rgb_f32/tests/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20557,7 +29741,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -563,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20566,7 +29750,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -601,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20580,7 +29764,22 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/rgb_u16/Makefile.in
+++ krita/colorspaces/rgb_u16/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(krita_rgb_u16_plugin_la_SOURCES) $(libkrita_rgb_u16_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -304,6 +302,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20590,7 +29789,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -614,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20599,7 +29798,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20613,7 +29812,22 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/rgb_u16/tests/Makefile.in
+++ krita/colorspaces/rgb_u16/tests/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20623,7 +29837,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -563,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20632,7 +29846,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -601,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20646,7 +29860,22 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/rgb_u8/Makefile.in
+++ krita/colorspaces/rgb_u8/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritargbplugin_la_SOURCES) $(libkritargb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20656,7 +29885,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -612,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20665,7 +29894,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -650,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20679,7 +29908,13 @@
@$(NORMAL_INSTALL)
--- krita/colorspaces/rgb_u8/templates/Makefile.in
+++ krita/colorspaces/rgb_u8/templates/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20689,7 +29924,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20698,7 +29933,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20712,7 +29947,22 @@
mostlyclean-libtool:
--- krita/colorspaces/rgb_u8/tests/Makefile.in
+++ krita/colorspaces/rgb_u8/tests/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_kis_strategy_colorspace_rgb_tester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20722,7 +29972,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -565,7 +566,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20731,7 +29981,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -603,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20745,7 +29995,22 @@
clean-checkLTLIBRARIES:
--- krita/colorspaces/wet/Makefile.in
+++ krita/colorspaces/wet/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritawetplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20755,7 +30020,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20764,7 +30029,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20776,9 +30041,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/colorspaces/wetsticky/Makefile.in
-+++ krita/colorspaces/wetsticky/Makefile.in
-@@ -302,6 +302,9 @@
+--- krita/colorspaces/wetsticky/brushop/Makefile.in
++++ krita/colorspaces/wetsticky/brushop/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritawsbrushpaintop_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20788,7 +30068,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20797,7 +30077,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20809,9 +30089,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/colorspaces/wetsticky/brushop/Makefile.in
-+++ krita/colorspaces/wetsticky/brushop/Makefile.in
-@@ -288,6 +288,9 @@
+--- krita/colorspaces/wetsticky/Makefile.in
++++ krita/colorspaces/wetsticky/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritawsplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -299,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20821,7 +30116,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20830,7 +30125,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20844,7 +30139,22 @@
@$(NORMAL_INSTALL)
--- krita/core/Makefile.in
+++ krita/core/Makefile.in
-@@ -422,6 +422,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritaimage_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -335,6 +333,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20854,7 +30164,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -879,7 +882,7 @@
+@@ -686,7 +687,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -20863,7 +30173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -917,9 +920,9 @@
+@@ -724,9 +725,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20877,7 +30187,22 @@
@$(NORMAL_INSTALL)
--- krita/core/tests/Makefile.in
+++ krita/core/tests/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_kis_filter_configuration_tester_la_SOURCES) $(kunittest_kis_image_tester_la_SOURCES) $(kunittest_kis_integer_maths_tester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20887,7 +30212,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -20896,7 +30221,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20910,7 +30235,22 @@
clean-checkLTLIBRARIES:
--- krita/core/tiles/Makefile.in
+++ krita/core/tiles/Makefile.in
-@@ -318,6 +318,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritatile_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -299,6 +297,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20920,7 +30260,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20929,7 +30269,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20943,7 +30283,22 @@
clean-noinstLTLIBRARIES:
--- krita/core/tiles/tests/Makefile.in
+++ krita/core/tiles/tests/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_kis_tiled_data_tester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20953,7 +30308,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -563,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20962,7 +30317,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -601,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20974,9 +30329,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
---- krita/data/Makefile.in
-+++ krita/data/Makefile.in
-@@ -253,6 +253,9 @@
+--- krita/data/brushes/Makefile.in
++++ krita/data/brushes/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20986,8 +30347,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
- all: docs-am all-recursive
+@@ -596,7 +599,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -20995,7 +30356,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21007,9 +30368,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/data/brushes/Makefile.in
-+++ krita/data/brushes/Makefile.in
-@@ -237,6 +237,9 @@
+--- krita/data/gradients/Makefile.in
++++ krita/data/gradients/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21019,7 +30386,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -556,7 +559,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21028,7 +30395,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -594,9 +597,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21040,9 +30407,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/data/gradients/Makefile.in
-+++ krita/data/gradients/Makefile.in
-@@ -237,6 +237,9 @@
+--- krita/data/images/Makefile.in
++++ krita/data/images/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21052,7 +30425,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -531,7 +534,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21061,7 +30434,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21073,9 +30446,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/data/images/Makefile.in
-+++ krita/data/images/Makefile.in
-@@ -237,6 +237,9 @@
+--- krita/data/Makefile.in
++++ krita/data/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -259,6 +259,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21085,8 +30464,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
- all: docs-am all-am
+@@ -550,7 +553,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -21094,7 +30473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -588,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21108,7 +30487,13 @@
mostlyclean-libtool:
--- krita/data/palettes/Makefile.in
+++ krita/data/palettes/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21118,7 +30503,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -577,7 +580,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21127,7 +30512,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21141,7 +30526,13 @@
mostlyclean-libtool:
--- krita/data/patterns/Makefile.in
+++ krita/data/patterns/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21151,7 +30542,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21160,7 +30551,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21174,7 +30565,13 @@
mostlyclean-libtool:
--- krita/data/profiles/Makefile.in
+++ krita/data/profiles/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21184,7 +30581,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21193,7 +30590,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21207,7 +30604,13 @@
mostlyclean-libtool:
--- krita/dtd/Makefile.in
+++ krita/dtd/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21217,7 +30620,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21226,7 +30629,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21238,9 +30641,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/kritacolor/Makefile.in
-+++ krita/kritacolor/Makefile.in
-@@ -341,6 +341,9 @@
+--- krita/kritacolor/colorspaces/Makefile.in
++++ krita/kritacolor/colorspaces/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritacolorspaces_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21250,7 +30668,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -661,7 +664,7 @@
+@@ -575,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21259,7 +30677,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -699,9 +702,9 @@
+@@ -613,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21269,11 +30687,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- krita/kritacolor/colorspaces/Makefile.in
-+++ krita/kritacolor/colorspaces/Makefile.in
-@@ -281,6 +281,9 @@
+
+ clean-noinstLTLIBRARIES:
+--- krita/kritacolor/Makefile.in
++++ krita/kritacolor/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libkritacolor_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -319,6 +317,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21283,7 +30716,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -644,7 +645,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21292,7 +30725,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -682,9 +683,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21302,11 +30735,26 @@
-$(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:
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- krita/kritacolor/tests/Makefile.in
+++ krita/kritacolor/tests/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_kis_color_conversions_tester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21316,7 +30764,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -563,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21325,7 +30773,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -601,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21337,9 +30785,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
---- krita/pics/Makefile.in
-+++ krita/pics/Makefile.in
-@@ -237,6 +237,9 @@
+--- krita/Makefile.in
++++ krita/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) $(libkritapart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) $(libkritapart_la_SOURCES) $(krita_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -121,8 +117,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
++#>- $(libkritapart_la_SOURCES)
++#>+ 2
+ SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
+- $(libkritapart_la_SOURCES)
++ $(libkritapart_la_SOURCES) $(krita_SOURCES)
+ #>- DIST_SOURCES = $(krita_la_SOURCES) $(libkritacommon_la_SOURCES) \
+ #>- $(libkritapart_la_SOURCES)
+ #>+ 2
+@@ -332,6 +331,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21349,16 +30827,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
- all: docs-am all-am
+@@ -644,7 +646,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -682,9 +684,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21368,11 +30846,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- krita/pics/Makefile.in
++++ krita/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- krita/plugins/Makefile.in
-+++ krita/plugins/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21382,8 +30866,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
- all: docs-am all-recursive
+@@ -544,7 +547,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -21391,7 +30875,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -582,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21403,9 +30887,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- krita/plugins/filters/Makefile.in
-+++ krita/plugins/filters/Makefile.in
-@@ -249,6 +249,9 @@
+--- krita/plugins/filters/bumpmap/Makefile.in
++++ krita/plugins/filters/bumpmap/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritabumpmap_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21415,16 +30914,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
- all: docs-am all-recursive
+@@ -584,7 +585,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -582,9 +585,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21434,11 +30933,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- krita/plugins/filters/cimg/Makefile.in
++++ krita/plugins/filters/cimg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- krita/plugins/filters/bumpmap/Makefile.in
-+++ krita/plugins/filters/bumpmap/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritacimg_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21448,7 +30962,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21457,7 +30971,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21469,9 +30983,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/filters/cimg/Makefile.in
-+++ krita/plugins/filters/cimg/Makefile.in
-@@ -282,6 +282,9 @@
+--- krita/plugins/filters/colorsfilters/Makefile.in
++++ krita/plugins/filters/colorsfilters/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritacolorsfilters_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21481,7 +31010,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21490,7 +31019,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21502,9 +31031,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/filters/colorsfilters/Makefile.in
-+++ krita/plugins/filters/colorsfilters/Makefile.in
-@@ -288,6 +288,9 @@
+--- krita/plugins/filters/convolutionfilters/Makefile.in
++++ krita/plugins/filters/convolutionfilters/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaconvolutionfilters_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21514,7 +31058,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21523,7 +31067,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21535,9 +31079,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/filters/convolutionfilters/Makefile.in
-+++ krita/plugins/filters/convolutionfilters/Makefile.in
-@@ -295,6 +295,9 @@
+--- krita/plugins/filters/cubismfilter/Makefile.in
++++ krita/plugins/filters/cubismfilter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritacubismfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21547,7 +31106,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21556,7 +31115,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21568,9 +31127,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/filters/cubismfilter/Makefile.in
-+++ krita/plugins/filters/cubismfilter/Makefile.in
-@@ -288,6 +288,9 @@
+--- krita/plugins/filters/embossfilter/Makefile.in
++++ krita/plugins/filters/embossfilter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaembossfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21580,7 +31154,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21589,7 +31163,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21601,9 +31175,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/filters/embossfilter/Makefile.in
-+++ krita/plugins/filters/embossfilter/Makefile.in
-@@ -285,6 +285,9 @@
+--- krita/plugins/filters/example/Makefile.in
++++ krita/plugins/filters/example/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaexample_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21613,7 +31202,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21622,7 +31211,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21634,9 +31223,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/filters/example/Makefile.in
-+++ krita/plugins/filters/example/Makefile.in
-@@ -276,6 +276,9 @@
+--- krita/plugins/filters/imageenhancement/Makefile.in
++++ krita/plugins/filters/imageenhancement/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaimageenhancement_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21646,16 +31250,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -609,9 +612,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21667,9 +31271,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/filters/imageenhancement/Makefile.in
-+++ krita/plugins/filters/imageenhancement/Makefile.in
-@@ -289,6 +289,9 @@
+--- krita/plugins/filters/Makefile.in
++++ krita/plugins/filters/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21679,16 +31289,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -549,7 +552,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -624,9 +627,9 @@
+@@ -587,9 +590,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21698,11 +31308,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- krita/plugins/filters/oilpaintfilter/Makefile.in
+++ krita/plugins/filters/oilpaintfilter/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaoilpaintfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21712,7 +31337,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21721,7 +31346,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21735,7 +31360,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/pixelizefilter/Makefile.in
+++ krita/plugins/filters/pixelizefilter/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritapixelizefilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21745,7 +31385,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21754,7 +31394,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21768,7 +31408,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/raindropsfilter/Makefile.in
+++ krita/plugins/filters/raindropsfilter/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaraindropsfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21778,7 +31433,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21787,7 +31442,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21801,7 +31456,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/roundcorners/Makefile.in
+++ krita/plugins/filters/roundcorners/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaroundcornersfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21811,7 +31481,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21820,7 +31490,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21834,7 +31504,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/smalltilesfilter/Makefile.in
+++ krita/plugins/filters/smalltilesfilter/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritasmalltilesfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21844,7 +31529,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21853,7 +31538,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21867,7 +31552,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/sobelfilter/Makefile.in
+++ krita/plugins/filters/sobelfilter/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritasobelfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21877,7 +31577,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21886,7 +31586,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21900,7 +31600,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/filters/threadtest/Makefile.in
+++ krita/plugins/filters/threadtest/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritathreadtest_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21910,7 +31625,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21919,7 +31634,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21931,8 +31646,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/paintops/Makefile.in
-+++ krita/plugins/paintops/Makefile.in
+--- krita/plugins/Makefile.in
++++ krita/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -21943,7 +31664,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21952,7 +31673,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21966,7 +31687,22 @@
mostlyclean-libtool:
--- krita/plugins/paintops/defaultpaintops/Makefile.in
+++ krita/plugins/paintops/defaultpaintops/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritadefaultpaintops_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21976,7 +31712,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -607,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21985,7 +31721,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -645,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21997,9 +31733,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- krita/plugins/paintops/Makefile.in
++++ krita/plugins/paintops/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
+ 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@
+@@ -537,7 +540,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(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*) \
+@@ -575,9 +578,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
+
+ mostlyclean-libtool:
--- krita/plugins/paintops/smearybrush/Makefile.in
+++ krita/plugins/paintops/smearybrush/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritasmearybrush_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22009,7 +31799,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22018,7 +31808,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22030,9 +31820,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/tools/Makefile.in
-+++ krita/plugins/tools/Makefile.in
-@@ -249,6 +249,9 @@
+--- krita/plugins/tools/defaulttools/Makefile.in
++++ krita/plugins/tools/defaulttools/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritadefaulttools_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22042,16 +31847,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
- all: docs-am all-recursive
+@@ -663,7 +664,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -577,9 +580,9 @@
+@@ -701,9 +702,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22061,11 +31866,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- krita/plugins/tools/Makefile.in
++++ krita/plugins/tools/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- krita/plugins/tools/defaulttools/Makefile.in
-+++ krita/plugins/tools/defaulttools/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22075,16 +31886,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -655,7 +658,7 @@
+@@ -544,7 +547,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -693,9 +696,9 @@
+@@ -582,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22094,11 +31905,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- krita/plugins/tools/selectiontools/Makefile.in
+++ krita/plugins/tools/selectiontools/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaselectiontools_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22108,7 +31934,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -627,7 +630,7 @@
+@@ -629,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22117,7 +31943,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -665,9 +668,9 @@
+@@ -667,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22131,7 +31957,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_crop/Makefile.in
+++ krita/plugins/tools/tool_crop/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritatoolcrop_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22141,7 +31982,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -602,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22150,7 +31991,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -640,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22164,7 +32005,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_filter/Makefile.in
+++ krita/plugins/tools/tool_filter/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritatoolfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22174,7 +32030,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22183,7 +32039,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22197,7 +32053,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_polygon/Makefile.in
+++ krita/plugins/tools/tool_polygon/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritatoolpolygon_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22207,7 +32078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22216,7 +32087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22230,7 +32101,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_polyline/Makefile.in
+++ krita/plugins/tools/tool_polyline/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritatoolpolyline_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22240,7 +32126,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22249,7 +32135,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22263,7 +32149,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_selectsimilar/Makefile.in
+++ krita/plugins/tools/tool_selectsimilar/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritatoolselectsimilar_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22273,7 +32174,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22282,7 +32183,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22296,7 +32197,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_star/Makefile.in
+++ krita/plugins/tools/tool_star/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritatoolstar_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22306,7 +32222,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22315,7 +32231,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22329,7 +32245,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/tools/tool_transform/Makefile.in
+++ krita/plugins/tools/tool_transform/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritatooltransform_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22339,7 +32270,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22348,7 +32279,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22360,9 +32291,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/Makefile.in
-+++ krita/plugins/viewplugins/Makefile.in
-@@ -251,6 +251,9 @@
+--- krita/plugins/viewplugins/colorrange/Makefile.in
++++ krita/plugins/viewplugins/colorrange/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritacolorrange_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22372,16 +32318,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
- all: docs-am all-recursive
+@@ -586,7 +587,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -583,9 +586,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22391,11 +32337,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- krita/plugins/viewplugins/colorspaceconversion/Makefile.in
++++ krita/plugins/viewplugins/colorspaceconversion/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- krita/plugins/viewplugins/colorrange/Makefile.in
-+++ krita/plugins/viewplugins/colorrange/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritacolorspaceconversion_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22405,7 +32366,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22414,7 +32375,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22426,9 +32387,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/colorspaceconversion/Makefile.in
-+++ krita/plugins/viewplugins/colorspaceconversion/Makefile.in
-@@ -288,6 +288,9 @@
+--- krita/plugins/viewplugins/dropshadow/Makefile.in
++++ krita/plugins/viewplugins/dropshadow/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritadropshadow_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22438,7 +32414,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22447,7 +32423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22459,9 +32435,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/dropshadow/Makefile.in
-+++ krita/plugins/viewplugins/dropshadow/Makefile.in
-@@ -283,6 +283,9 @@
+--- krita/plugins/viewplugins/filtersgallery/Makefile.in
++++ krita/plugins/viewplugins/filtersgallery/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritafiltersgallery_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22471,7 +32462,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22480,7 +32471,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22492,9 +32483,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/filtersgallery/Makefile.in
-+++ krita/plugins/viewplugins/filtersgallery/Makefile.in
-@@ -286,6 +286,9 @@
+--- krita/plugins/viewplugins/histogram/Makefile.in
++++ krita/plugins/viewplugins/histogram/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritahistogram_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22504,7 +32510,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22513,7 +32519,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22525,9 +32531,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/histogram/Makefile.in
-+++ krita/plugins/viewplugins/histogram/Makefile.in
-@@ -289,6 +289,9 @@
+--- krita/plugins/viewplugins/histogram_docker/Makefile.in
++++ krita/plugins/viewplugins/histogram_docker/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritahistogramdocker_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22537,7 +32558,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22546,7 +32567,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22558,9 +32579,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/histogram_docker/Makefile.in
-+++ krita/plugins/viewplugins/histogram_docker/Makefile.in
-@@ -295,6 +295,9 @@
+--- krita/plugins/viewplugins/history_docker/Makefile.in
++++ krita/plugins/viewplugins/history_docker/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ #kde_services_DATA = kritahistorydocker.desktop
+
+
+-SOURCES = $(kritahistorydocker_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22570,7 +32606,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22579,7 +32615,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22591,9 +32627,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/history_docker/Makefile.in
-+++ krita/plugins/viewplugins/history_docker/Makefile.in
-@@ -275,6 +275,9 @@
+--- krita/plugins/viewplugins/imagesize/Makefile.in
++++ krita/plugins/viewplugins/imagesize/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaimagesize_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22603,7 +32654,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22612,7 +32663,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22624,9 +32675,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/imagesize/Makefile.in
-+++ krita/plugins/viewplugins/imagesize/Makefile.in
-@@ -289,6 +289,9 @@
+--- krita/plugins/viewplugins/Makefile.in
++++ krita/plugins/viewplugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -251,6 +251,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22636,16 +32693,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -550,7 +553,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -626,9 +629,9 @@
+@@ -588,9 +591,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22655,11 +32712,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- krita/plugins/viewplugins/performancetest/Makefile.in
+++ krita/plugins/viewplugins/performancetest/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaperftest_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22669,7 +32741,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22678,7 +32750,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22692,7 +32764,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/rotateimage/Makefile.in
+++ krita/plugins/viewplugins/rotateimage/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritarotateimage_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22702,7 +32789,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22711,7 +32798,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22725,7 +32812,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/screenshot/Makefile.in
+++ krita/plugins/viewplugins/screenshot/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritascreenshot_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22735,7 +32837,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22744,7 +32846,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22756,9 +32858,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/scripting/Makefile.in
-+++ krita/plugins/viewplugins/scripting/Makefile.in
-@@ -294,6 +294,9 @@
+--- krita/plugins/viewplugins/scripting/kritacore/Makefile.in
++++ krita/plugins/viewplugins/scripting/kritacore/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(krosskritacore_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -308,6 +306,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22768,16 +32885,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -619,7 +620,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -632,9 +635,9 @@
+@@ -657,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22789,9 +32906,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/scripting/kritacore/Makefile.in
-+++ krita/plugins/viewplugins/scripting/kritacore/Makefile.in
-@@ -338,6 +338,9 @@
+--- krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
++++ krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritascripting_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22801,7 +32933,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -644,7 +647,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22810,7 +32942,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,9 +685,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22820,11 +32952,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
-+++ krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
-@@ -275,6 +275,9 @@
+--- krita/plugins/viewplugins/scripting/Makefile.in
++++ krita/plugins/viewplugins/scripting/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritascripting_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22834,16 +32981,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .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*) \
-@@ -610,9 +613,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22853,10 +33000,16 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/scripting/samples/Makefile.in
+++ krita/plugins/viewplugins/scripting/samples/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -22867,7 +33020,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22876,7 +33029,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22890,7 +33043,13 @@
mostlyclean-libtool:
--- krita/plugins/viewplugins/scripting/samples/python/Makefile.in
+++ krita/plugins/viewplugins/scripting/samples/python/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -239,6 +239,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22900,7 +33059,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -527,7 +530,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22909,7 +33068,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -565,9 +568,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22923,7 +33082,13 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/scripting/samples/ruby/Makefile.in
+++ krita/plugins/viewplugins/scripting/samples/ruby/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22933,7 +33098,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22942,7 +33107,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22956,7 +33121,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/separate_channels/Makefile.in
+++ krita/plugins/viewplugins/separate_channels/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritaseparatechannels_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22966,7 +33146,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -22975,7 +33155,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22989,7 +33169,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/shearimage/Makefile.in
+++ krita/plugins/viewplugins/shearimage/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritashearimage_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22999,7 +33194,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -23008,7 +33203,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23022,7 +33217,22 @@
@$(NORMAL_INSTALL)
--- krita/plugins/viewplugins/variations/Makefile.in
+++ krita/plugins/viewplugins/variations/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kritavariations_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23032,7 +33242,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -23041,7 +33251,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23055,7 +33265,22 @@
@$(NORMAL_INSTALL)
--- krita/sdk/Makefile.in
+++ krita/sdk/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritasdk_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -276,6 +274,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23065,7 +33290,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -23074,7 +33299,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23088,7 +33313,22 @@
clean-noinstLTLIBRARIES:
--- krita/ui/Makefile.in
+++ krita/ui/Makefile.in
-@@ -504,6 +504,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkritaui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -346,6 +344,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23098,7 +33338,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -886,7 +889,7 @@
+@@ -734,7 +735,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -23107,7 +33347,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -924,9 +927,9 @@
+@@ -772,9 +773,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23119,42 +33359,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kspread/Makefile.in
-+++ kspread/Makefile.in
-@@ -554,6 +554,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@
-@@ -909,7 +912,7 @@
+--- kspread/dialogs/Makefile.in
++++ kspread/dialogs/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- .SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -947,9 +950,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
--$(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
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kspread/dialogs/Makefile.in
-+++ kspread/dialogs/Makefile.in
-@@ -388,6 +388,9 @@
+
+-SOURCES = $(libdialogs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23164,7 +33386,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -778,7 +781,7 @@
+@@ -692,7 +693,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -23173,7 +33395,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -816,9 +819,9 @@
+@@ -730,9 +731,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23187,7 +33409,13 @@
clean-noinstLTLIBRARIES:
--- kspread/dtd/Makefile.in
+++ kspread/dtd/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23197,7 +33425,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23206,7 +33434,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23220,7 +33448,13 @@
mostlyclean-libtool:
--- kspread/extensions/Makefile.in
+++ kspread/extensions/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23230,7 +33464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -532,7 +535,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23239,7 +33473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -570,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23251,9 +33485,39 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/pics/Makefile.in
-+++ kspread/pics/Makefile.in
-@@ -233,6 +233,9 @@
+--- kspread/Makefile.in
++++ kspread/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) $(libkspreadpart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) $(libkspreadpart_la_SOURCES) $(kspread_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -167,8 +163,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
++#>- $(libkspreadpart_la_SOURCES)
++#>+ 2
+ SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
+- $(libkspreadpart_la_SOURCES)
++ $(libkspreadpart_la_SOURCES) $(kspread_SOURCES)
+ #>- DIST_SOURCES = $(kspread_la_SOURCES) $(libkspreadcommon_la_SOURCES) \
+ #>- $(libkspreadpart_la_SOURCES)
+ #>+ 2
+@@ -379,6 +378,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23263,16 +33527,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
- all: docs-am all-am
+@@ -739,7 +741,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -777,9 +779,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23282,11 +33546,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kspread/pics/Makefile.in
++++ kspread/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- kspread/plugins/Makefile.in
-+++ kspread/plugins/Makefile.in
-@@ -249,6 +249,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23296,8 +33566,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -518,7 +521,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -23305,7 +33575,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23319,7 +33589,22 @@
mostlyclean-libtool:
--- kspread/plugins/calculator/Makefile.in
+++ kspread/plugins/calculator/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkspreadcalc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -295,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23329,7 +33614,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23338,7 +33623,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23352,6 +33637,12 @@
@$(NORMAL_INSTALL)
--- kspread/plugins/calculator/pics/Makefile.in
+++ kspread/plugins/calculator/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23362,7 +33653,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -518,7 +521,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23371,7 +33662,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23385,7 +33676,22 @@
mostlyclean-libtool:
--- kspread/plugins/insertcalendar/Makefile.in
+++ kspread/plugins/insertcalendar/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkspreadinsertcalendar_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23395,7 +33701,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -23404,7 +33710,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23416,9 +33722,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kspread/sheetstyles/Makefile.in
-+++ kspread/sheetstyles/Makefile.in
-@@ -237,6 +237,9 @@
+--- kspread/plugins/Makefile.in
++++ kspread/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23428,8 +33740,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
- all: docs-am all-am
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -23437,7 +33749,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23449,9 +33761,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/templates/Business/Makefile.in
-+++ kspread/templates/Business/Makefile.in
-@@ -238,6 +238,9 @@
+--- kspread/sheetstyles/Makefile.in
++++ kspread/sheetstyles/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23461,7 +33779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23470,7 +33788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23482,9 +33800,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/templates/General/Makefile.in
-+++ kspread/templates/General/Makefile.in
-@@ -238,6 +238,9 @@
+--- kspread/templates/Business/Makefile.in
++++ kspread/templates/Business/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23494,7 +33818,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23503,7 +33827,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23515,9 +33839,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/templates/HomeFamily/Makefile.in
-+++ kspread/templates/HomeFamily/Makefile.in
-@@ -238,6 +238,9 @@
+--- kspread/templates/General/Makefile.in
++++ kspread/templates/General/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23527,7 +33857,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -535,7 +538,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23536,7 +33866,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23548,9 +33878,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/templates/Makefile.in
-+++ kspread/templates/Makefile.in
-@@ -249,6 +249,9 @@
+--- kspread/templates/HomeFamily/Makefile.in
++++ kspread/templates/HomeFamily/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23560,8 +33896,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -535,7 +538,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -23569,7 +33905,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23581,9 +33917,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kspread/tests/Makefile.in
-+++ kspread/tests/Makefile.in
-@@ -286,6 +286,9 @@
+--- kspread/templates/Makefile.in
++++ kspread/templates/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23593,16 +33935,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -629,9 +632,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23613,10 +33955,25 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- clean-noinstLTLIBRARIES:
---- kspread/toolbar/Makefile.in
-+++ kspread/toolbar/Makefile.in
-@@ -249,6 +249,9 @@
+ mostlyclean-libtool:
+--- kspread/tests/Makefile.in
++++ kspread/tests/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libtests_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23626,16 +33983,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
- all: docs-am all-recursive
+@@ -583,7 +584,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -569,9 +572,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23646,9 +34003,15 @@
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- mostlyclean-libtool:
+ clean-noinstLTLIBRARIES:
--- kspread/toolbar/crystalsvg/Makefile.in
+++ kspread/toolbar/crystalsvg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23659,7 +34022,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23668,7 +34031,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23680,9 +34043,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kugar/Makefile.in
-+++ kugar/Makefile.in
-@@ -250,6 +250,9 @@
+--- kspread/toolbar/Makefile.in
++++ kspread/toolbar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23692,7 +34061,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -23701,7 +34070,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23715,7 +34084,37 @@
mostlyclean-libtool:
--- kugar/kudesigner/Makefile.in
+++ kugar/kudesigner/Makefile.in
-@@ -346,6 +346,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(kudesigner_la_SOURCES) $(libkudesignercore_la_SOURCES) $(libkudesignerpart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kudesigner_la_SOURCES) $(libkudesignercore_la_SOURCES) $(libkudesignerpart_la_SOURCES) $(kudesigner_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -127,8 +123,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kudesigner_la_SOURCES) $(libkudesignercore_la_SOURCES) \
++#>- $(libkudesignerpart_la_SOURCES)
++#>+ 2
+ SOURCES = $(kudesigner_la_SOURCES) $(libkudesignercore_la_SOURCES) \
+- $(libkudesignerpart_la_SOURCES)
++ $(libkudesignerpart_la_SOURCES) $(kudesigner_SOURCES)
+ #>- DIST_SOURCES = $(kudesigner_la_SOURCES) \
+ #>- $(libkudesignercore_la_SOURCES) \
+ #>- $(libkudesignerpart_la_SOURCES)
+@@ -339,6 +338,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23725,7 +34124,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -664,7 +667,7 @@
+@@ -662,7 +664,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23734,7 +34133,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -702,9 +705,9 @@
+@@ -700,9 +702,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23748,6 +34147,12 @@
@$(NORMAL_INSTALL)
--- kugar/kudesigner/pics/Makefile.in
+++ kugar/kudesigner/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23758,7 +34163,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -518,7 +521,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23767,7 +34172,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23781,7 +34186,13 @@
mostlyclean-libtool:
--- kugar/kudesigner/templates/General/Makefile.in
+++ kugar/kudesigner/templates/General/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23791,7 +34202,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -544,7 +547,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23800,7 +34211,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -582,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23814,6 +34225,12 @@
mostlyclean-libtool:
--- kugar/kudesigner/templates/Makefile.in
+++ kugar/kudesigner/templates/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23824,7 +34241,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -23833,7 +34250,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23847,6 +34264,12 @@
mostlyclean-libtool:
--- kugar/kudesigner/toolbar/Makefile.in
+++ kugar/kudesigner/toolbar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -23857,7 +34280,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23866,7 +34289,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23880,7 +34303,22 @@
mostlyclean-libtool:
--- kugar/kudesigner_lib/Makefile.in
+++ kugar/kudesigner_lib/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkudesignercommon_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23890,7 +34328,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23899,7 +34337,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23913,7 +34351,22 @@
clean-noinstLTLIBRARIES:
--- kugar/lib/Makefile.in
+++ kugar/lib/Makefile.in
-@@ -327,6 +327,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkugarlib_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23923,7 +34376,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -624,7 +627,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23932,7 +34385,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +665,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23944,9 +34397,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kugar/part/Makefile.in
-+++ kugar/part/Makefile.in
-@@ -314,6 +314,9 @@
+--- kugar/Makefile.in
++++ kugar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -250,6 +250,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23956,16 +34415,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -623,7 +626,7 @@
+@@ -538,7 +541,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -661,9 +664,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23975,11 +34434,39 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- kugar/samples/Makefile.in
-+++ kugar/samples/Makefile.in
-@@ -237,6 +237,9 @@
+
+ mostlyclean-libtool:
+--- kugar/part/Makefile.in
++++ kugar/part/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES) $(kugar_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -119,7 +115,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES)
++#>- SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES)
++#>+ 1
++SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES) $(kugar_SOURCES)
+ #>- DIST_SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kugar_la_SOURCES) $(libkugarpart_la_SOURCES) $(kugar_SOURCES)
+@@ -314,6 +312,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23989,16 +34476,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
- all: docs-am all-am
+@@ -628,7 +629,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*) \
-@@ -557,9 +560,9 @@
+@@ -666,9 +667,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24008,11 +34495,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kugar/samples/Makefile.in
++++ kugar/samples/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- kword/Makefile.in
-+++ kword/Makefile.in
-@@ -602,6 +602,9 @@
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24022,16 +34515,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -1001,7 +1004,7 @@
+@@ -530,7 +533,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+-$(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*) \
-@@ -1039,9 +1042,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24041,11 +34534,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- kword/data/Makefile.in
+++ kword/data/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24055,7 +34554,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24064,7 +34563,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24078,7 +34577,13 @@
mostlyclean-libtool:
--- kword/dtd/Makefile.in
+++ kword/dtd/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -247,6 +247,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24088,7 +34593,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24097,7 +34602,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24111,7 +34616,13 @@
mostlyclean-libtool:
--- kword/expression/Makefile.in
+++ kword/expression/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24121,7 +34632,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24130,7 +34641,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24144,7 +34655,13 @@
mostlyclean-libtool:
--- kword/horizontalline/Makefile.in
+++ kword/horizontalline/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24154,7 +34671,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24163,7 +34680,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24175,9 +34692,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kword/mailmerge/Makefile.in
-+++ kword/mailmerge/Makefile.in
-@@ -289,6 +289,9 @@
+--- kword/mailmerge/kabc/Makefile.in
++++ kword/mailmerge/kabc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kwmailmerge_kabc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24187,7 +34719,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24196,7 +34728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24208,9 +34740,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kword/mailmerge/kabc/Makefile.in
-+++ kword/mailmerge/kabc/Makefile.in
-@@ -284,6 +284,9 @@
+--- kword/mailmerge/kspread/Makefile.in
++++ kword/mailmerge/kspread/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kwmailmerge_kspread_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24220,7 +34767,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24229,7 +34776,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24241,9 +34788,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kword/mailmerge/kspread/Makefile.in
-+++ kword/mailmerge/kspread/Makefile.in
-@@ -286,6 +286,9 @@
+--- kword/mailmerge/Makefile.in
++++ kword/mailmerge/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kwmailmerge_classic_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24253,7 +34815,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24262,7 +34824,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24276,7 +34838,22 @@
@$(NORMAL_INSTALL)
--- kword/mailmerge/sql/Makefile.in
+++ kword/mailmerge/sql/Makefile.in
-@@ -319,6 +319,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(kwmailmerge_qtsqldb_la_SOURCES) $(kwmailmerge_qtsqldb_power_la_SOURCES) $(libmailmergesqlcommon_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -310,6 +308,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24286,7 +34863,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -629,7 +632,7 @@
+@@ -625,7 +626,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24295,7 +34872,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +670,9 @@
+@@ -663,9 +664,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24307,8 +34884,77 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- kword/Makefile.in
++++ kword/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,10 +18,6 @@
+
+
+
+-#>- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES) $(kword_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -185,8 +181,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) \
++#>- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
++#>+ 2
+ SOURCES = $(kword_la_SOURCES) $(libkwmailmerge_interface_la_SOURCES) \
+- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
++ $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES) $(kword_SOURCES)
+ #>- DIST_SOURCES = $(kword_la_SOURCES) \
+ #>- $(libkwmailmerge_interface_la_SOURCES) \
+ #>- $(libkwordpart_la_SOURCES) $(libkwordprivate_la_SOURCES)
+@@ -402,6 +401,9 @@
+ 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@
+@@ -808,7 +810,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -846,9 +848,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
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- kword/pics/Makefile.in
+++ kword/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -24319,7 +34965,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -518,7 +521,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24328,7 +34974,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -556,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24342,7 +34988,13 @@
mostlyclean-libtool:
--- kword/templates/CardsAndLabels/Makefile.in
+++ kword/templates/CardsAndLabels/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24352,7 +35004,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24361,7 +35013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24375,7 +35027,13 @@
mostlyclean-libtool:
--- kword/templates/Envelopes/Makefile.in
+++ kword/templates/Envelopes/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24385,7 +35043,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24394,7 +35052,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24408,6 +35066,12 @@
mostlyclean-libtool:
--- kword/templates/Makefile.in
+++ kword/templates/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -24418,7 +35082,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -24427,7 +35091,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24441,7 +35105,13 @@
mostlyclean-libtool:
--- kword/templates/Wordprocessing/Makefile.in
+++ kword/templates/Wordprocessing/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24451,7 +35121,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -542,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24460,7 +35130,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24474,7 +35144,22 @@
mostlyclean-libtool:
--- kword/tests/Makefile.in
+++ kword/tests/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_FrameTester_la_SOURCES) $(kunittest_FrameViewTester_la_SOURCES) $(kunittest_KWPageManagerTester_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24484,7 +35169,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24493,7 +35178,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24507,6 +35192,12 @@
clean-checkLTLIBRARIES:
--- kword/toolbar/Makefile.in
+++ kword/toolbar/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -24517,7 +35208,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24526,7 +35217,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24538,9 +35229,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- lib/Makefile.in
-+++ lib/Makefile.in
-@@ -251,6 +251,9 @@
+--- lib/kformula/config/Makefile.in
++++ lib/kformula/config/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24550,16 +35247,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
- all: docs-am all-recursive
+@@ -553,7 +556,7 @@
+ all: docs-am all-am
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+-$(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*) \
-@@ -578,9 +581,9 @@
+@@ -591,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24571,9 +35268,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- lib/kformula/Makefile.in
-+++ lib/kformula/Makefile.in
-@@ -413,6 +413,9 @@
+--- lib/kformula/dtd/Makefile.in
++++ lib/kformula/dtd/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24583,16 +35286,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -721,7 +724,7 @@
+@@ -529,7 +532,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -759,9 +762,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24602,11 +35305,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- lib/kformula/config/Makefile.in
-+++ lib/kformula/config/Makefile.in
-@@ -237,6 +237,9 @@
+
+ mostlyclean-libtool:
+--- lib/kformula/Makefile.in
++++ lib/kformula/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkformulalib_la_SOURCES) $(kformulatest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -322,6 +320,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24616,16 +35334,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
- all: docs-am all-am
+@@ -635,7 +636,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -580,9 +583,9 @@
+@@ -673,9 +674,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24635,11 +35353,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- lib/kformula/pics/crystalsvg/Makefile.in
++++ lib/kformula/pics/crystalsvg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- lib/kformula/dtd/Makefile.in
-+++ lib/kformula/dtd/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24649,7 +35373,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24658,7 +35382,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24672,6 +35396,12 @@
mostlyclean-libtool:
--- lib/kformula/pics/Makefile.in
+++ lib/kformula/pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -24682,7 +35412,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -24691,7 +35421,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24703,42 +35433,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- lib/kformula/pics/crystalsvg/Makefile.in
-+++ lib/kformula/pics/crystalsvg/Makefile.in
-@@ -233,6 +233,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@
-@@ -514,7 +517,7 @@
- all: docs-am all-am
+--- lib/kofficecore/Makefile.in
++++ lib/kofficecore/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- .SUFFIXES:
--$(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*) \
-@@ -552,9 +555,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -19,8 +19,6 @@
--$(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
- mostlyclean-libtool:
---- lib/kofficecore/Makefile.in
-+++ lib/kofficecore/Makefile.in
-@@ -474,6 +474,9 @@
+
+-SOURCES = $(kodocinfopropspage_la_SOURCES) $(libkofficecore_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -342,6 +340,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24748,7 +35460,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -842,7 +845,7 @@
+@@ -715,7 +716,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -24757,7 +35469,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -880,9 +883,9 @@
+@@ -753,9 +754,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24771,7 +35483,22 @@
@$(NORMAL_INSTALL)
--- lib/kofficecore/tests/Makefile.in
+++ lib/kofficecore/tests/Makefile.in
-@@ -337,6 +337,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+ ####### General stuff
+-SOURCES = $(filter_graph_SOURCES) $(filterchain_test_SOURCES) $(kodomtest_SOURCES) $(kogenstylestest_SOURCES) $(kooasissettingstest_SOURCES) $(kooasisstoretest_SOURCES) $(kopointtest_SOURCES) $(korecttest_SOURCES) $(priorityqueue_test_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -318,6 +316,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24781,7 +35508,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -637,7 +640,7 @@
+@@ -623,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24790,7 +35517,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -675,9 +678,9 @@
+@@ -661,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24804,7 +35531,22 @@
clean-checkPROGRAMS:
--- lib/kofficeui/Makefile.in
+++ lib/kofficeui/Makefile.in
-@@ -421,6 +421,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ###### General stuff
+
+
+-SOURCES = $(libkofficeui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -321,6 +319,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24814,16 +35556,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -773,7 +776,7 @@
+@@ -678,7 +679,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .cpp .lo .o .obj
+ .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*) \
-@@ -811,9 +814,9 @@
+@@ -716,9 +717,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24837,7 +35579,13 @@
@$(NORMAL_INSTALL)
--- lib/kofficeui/pics/Makefile.in
+++ lib/kofficeui/pics/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24847,7 +35595,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -539,7 +542,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24856,7 +35604,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -577,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24870,6 +35618,12 @@
mostlyclean-libtool:
--- lib/kofficeui/tests/Makefile.in
+++ lib/kofficeui/tests/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -236,6 +236,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -24880,7 +35634,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -525,7 +528,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24889,7 +35643,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -563,9 +566,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24903,7 +35657,22 @@
clean-checkPROGRAMS:
--- lib/kopainter/Makefile.in
+++ lib/kopainter/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopainter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24913,7 +35682,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24922,7 +35691,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24936,7 +35705,22 @@
@$(NORMAL_INSTALL)
--- lib/kopalette/Makefile.in
+++ lib/kopalette/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkopalette_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24946,7 +35730,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24955,7 +35739,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24967,9 +35751,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- lib/koproperty/Makefile.in
-+++ lib/koproperty/Makefile.in
-@@ -301,6 +301,9 @@
+--- lib/koproperty/editors/Makefile.in
++++ lib/koproperty/editors/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkopropertyeditors_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -295,6 +293,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24979,7 +35778,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24988,7 +35787,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24998,11 +35797,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- lib/koproperty/editors/Makefile.in
-+++ lib/koproperty/editors/Makefile.in
-@@ -344,6 +344,9 @@
+
+ clean-noinstLTLIBRARIES:
+--- lib/koproperty/Makefile.in
++++ lib/koproperty/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkoproperty_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25012,7 +35826,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +638,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25021,7 +35835,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +676,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25031,11 +35845,26 @@
-$(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:
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- lib/koproperty/test/Makefile.in
+++ lib/koproperty/test/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(propertytest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25045,7 +35874,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -570,7 +571,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25054,7 +35883,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -608,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25066,9 +35895,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
---- lib/kotext/Makefile.in
-+++ lib/kotext/Makefile.in
-@@ -458,6 +458,9 @@
+--- lib/kotext/kohyphen/hyphdicts/Makefile.in
++++ lib/kotext/kohyphen/hyphdicts/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25078,16 +35913,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -781,7 +784,7 @@
+@@ -530,7 +533,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -819,9 +822,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25097,11 +35932,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- lib/kotext/kohyphen/Makefile.in
+++ lib/kotext/kohyphen/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkohyphen_la_SOURCES) $(kohyphentest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25111,7 +35961,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -25120,7 +35970,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25132,9 +35982,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
---- lib/kotext/kohyphen/hyphdicts/Makefile.in
-+++ lib/kotext/kohyphen/hyphdicts/Makefile.in
-@@ -237,6 +237,9 @@
+--- lib/kotext/Makefile.in
++++ lib/kotext/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkotext_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -322,6 +320,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25144,16 +36009,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
- all: docs-am all-am
+@@ -650,7 +651,7 @@
.SUFFIXES:
+ .SUFFIXES: .cc .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*) \
-@@ -557,9 +560,9 @@
+@@ -688,9 +689,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25163,11 +36028,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
--- lib/kotext/tests/Makefile.in
+++ lib/kotext/tests/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-SOURCES = $(kunittest_KoUserStyleTester_la_SOURCES) $(kobordertest_SOURCES) $(kotextformattertest_SOURCES) $(kovariabletest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25177,7 +36057,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25186,7 +36066,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25198,42 +36078,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
---- lib/kross/Makefile.in
-+++ lib/kross/Makefile.in
-@@ -249,6 +249,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@
-@@ -542,7 +545,7 @@
- all: docs-am all-recursive
+--- lib/kross/api/Makefile.in
++++ lib/kross/api/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- .SUFFIXES:
--$(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*) \
-@@ -580,9 +583,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
--$(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
- mostlyclean-libtool:
---- lib/kross/api/Makefile.in
-+++ lib/kross/api/Makefile.in
-@@ -324,6 +324,9 @@
+-SOURCES = $(libkrossapi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -302,6 +300,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25243,7 +36105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -634,7 +635,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25252,7 +36114,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -672,9 +673,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25264,9 +36126,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- lib/kross/kjs/Makefile.in
-+++ lib/kross/kjs/Makefile.in
-@@ -285,6 +285,9 @@
+--- lib/kross/main/Makefile.in
++++ lib/kross/main/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkrossmain_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -303,6 +301,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25276,7 +36153,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -621,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25285,7 +36162,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -659,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25295,11 +36172,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- lib/kross/Makefile.in
++++ lib/kross/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- clean-noinstLTLIBRARIES:
---- lib/kross/main/Makefile.in
-+++ lib/kross/main/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25309,16 +36192,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -547,7 +550,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/lib/kross/Makefile.global $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/lib/kross/Makefile.global $(am__configure_deps)
+-$(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*) \
-@@ -654,9 +657,9 @@
+@@ -585,9 +588,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25328,11 +36211,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- lib/kross/python/CXX/Makefile.in
+++ lib/kross/python/CXX/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libkrosspythoncxx_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25342,7 +36240,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .c .cxx .lo .o .obj
@@ -25351,7 +36249,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25365,7 +36263,22 @@
clean-noinstLTLIBRARIES:
--- lib/kross/python/Makefile.in
+++ lib/kross/python/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(krosspython_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -300,6 +298,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25375,7 +36288,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -616,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25384,7 +36297,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -654,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25398,6 +36311,12 @@
@$(NORMAL_INSTALL)
--- lib/kross/python/scripts/Makefile.in
+++ lib/kross/python/scripts/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -253,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -25408,7 +36327,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -540,7 +543,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25417,7 +36336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -578,9 +581,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25431,6 +36350,12 @@
@$(NORMAL_INSTALL)
--- lib/kross/python/scripts/RestrictedPython/Makefile.in
+++ lib/kross/python/scripts/RestrictedPython/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -237,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -25441,7 +36366,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -526,7 +529,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25450,7 +36375,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -564,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25464,7 +36389,22 @@
@$(NORMAL_INSTALL)
--- lib/kross/ruby/Makefile.in
+++ lib/kross/ruby/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(krossruby_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25474,7 +36414,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25483,7 +36423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25495,9 +36435,72 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- lib/kross/runner/Makefile.in
++++ lib/kross/runner/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(krossrunner_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
+ 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@
+@@ -578,7 +579,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/lib/kross/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/lib/kross/Makefile.global $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -616,9 +617,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
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
--- lib/kross/test/Makefile.in
+++ lib/kross/test/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(krosstest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25507,7 +36510,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25516,7 +36519,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25530,7 +36533,22 @@
clean-noinstPROGRAMS:
--- lib/kwmf/Makefile.in
+++ lib/kwmf/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -18,8 +18,6 @@
+ ####### General stuff
+
+
+-SOURCES = $(libkowmf_la_SOURCES) $(libkwmf_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25540,7 +36558,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25549,7 +36567,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25561,9 +36579,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+--- lib/Makefile.in
++++ lib/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -251,6 +251,9 @@
+ 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@
+@@ -545,7 +548,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -583,9 +586,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
+
+ mostlyclean-libtool:
--- lib/store/Makefile.in
+++ lib/store/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libkstore_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25573,7 +36645,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25582,7 +36654,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25596,7 +36668,22 @@
@$(NORMAL_INSTALL)
--- lib/store/tests/Makefile.in
+++ lib/store/tests/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+ ####### General stuff
+-SOURCES = $(storage_test_SOURCES) $(storedroptest_SOURCES) $(xmlwritertest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25606,7 +36693,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -573,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25615,7 +36702,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -611,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25627,9 +36714,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
---- mimetypes/Makefile.in
-+++ mimetypes/Makefile.in
-@@ -249,6 +249,9 @@
+--- Makefile.in
++++ Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -267,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25639,16 +36732,76 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
- all: docs-am all-recursive
+@@ -565,7 +568,7 @@
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -607,12 +610,12 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ cd $(srcdir) && rm -f configure
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+@@ -624,7 +627,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: $(am__configure_deps)
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+@@ -1134,7 +1137,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=koffice.lsm Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in Makefile.am acinclude.m4 changes-1.5 Makefile.am.in
++KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in changes-1.4-beta1 aclocal.m4 Doxyfile.temp configure.in.in configure Makefile.am acinclude.m4 changes-1.5 Makefile.am.in
+
+ #>+ 2
+ docs-am:
+--- mimetypes/kde33/Makefile.in
++++ mimetypes/kde33/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
+ 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@
+@@ -542,7 +545,7 @@
+ all: docs-am all-am
+
.SUFFIXES:
-$(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*) \
-@@ -568,9 +571,9 @@
+@@ -580,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25660,9 +36813,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- mimetypes/kde33/Makefile.in
-+++ mimetypes/kde33/Makefile.in
-@@ -237,6 +237,9 @@
+--- mimetypes/kde351/Makefile.in
++++ mimetypes/kde351/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25672,7 +36831,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -530,7 +533,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25681,7 +36840,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -568,9 +571,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25693,8 +36852,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- pics/Makefile.in
-+++ pics/Makefile.in
+--- mimetypes/Makefile.in
++++ mimetypes/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -25705,7 +36870,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -536,7 +539,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25714,7 +36879,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -574,9 +577,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25728,6 +36893,12 @@
mostlyclean-libtool:
--- pics/crystalsvg/Makefile.in
+++ pics/crystalsvg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -25738,7 +36909,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -519,7 +522,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25747,7 +36918,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -557,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25759,8 +36930,75 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -828,9 +831,9 @@
+ $(INSTALL_DATA) $(srcdir)/cr22-action-newslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/newslide.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-tab_first.png $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/tab_first.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-frame_edit.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_edit.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-delslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-fontsizedown.png $(DESTDIR)$(kofficedir)/crystalsvg/48x48/actions/fontsizedown.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-view_remove.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/view_remove.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-delslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-aotop.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/aotop.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-kdb_table.png $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/kdb_table.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-frame_image.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_image.png
+@@ -966,9 +969,9 @@
+ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/newslide.png
+ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/tab_first.png
+ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_edit.png
++ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
+ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/48x48/actions/fontsizedown.png
+ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/view_remove.png
+- -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
+ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/aotop.png
+ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/kdb_table.png
+ -rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_image.png
+--- pics/Makefile.in
++++ pics/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
+ 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@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(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*) \
+@@ -572,9 +575,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
+
+ mostlyclean-libtool:
--- plugins/Makefile.in
+++ plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -25771,7 +37009,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -534,7 +537,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25780,7 +37018,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25794,7 +37032,22 @@
mostlyclean-libtool:
--- plugins/scan/Makefile.in
+++ plugins/scan/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kofficescan_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25804,7 +37057,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25813,7 +37066,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25827,7 +37080,13 @@
@$(NORMAL_INSTALL)
--- servicetypes/Makefile.in
+++ servicetypes/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25837,7 +37096,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -531,7 +534,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25846,7 +37105,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -569,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25860,7 +37119,13 @@
mostlyclean-libtool:
--- templates/Makefile.in
+++ templates/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -244,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25870,7 +37135,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -532,7 +535,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25879,7 +37144,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -570,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25891,9 +37156,24 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- tools/Makefile.in
-+++ tools/Makefile.in
-@@ -249,6 +249,9 @@
+--- tools/converter/Makefile.in
++++ tools/converter/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -15,8 +15,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(koconverter_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -269,6 +267,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25903,16 +37183,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -559,7 +560,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*) \
-@@ -567,9 +570,9 @@
+@@ -597,9 +598,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25922,11 +37202,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+--- tools/kfile-plugins/abiword/Makefile.in
++++ tools/kfile-plugins/abiword/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- tools/converter/Makefile.in
-+++ tools/converter/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_abiword_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25936,16 +37231,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -595,9 +598,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25955,11 +37250,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- tools/kfile-plugins/Makefile.in
-+++ tools/kfile-plugins/Makefile.in
-@@ -249,6 +249,9 @@
+--- tools/kfile-plugins/gnumeric/Makefile.in
++++ tools/kfile-plugins/gnumeric/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_gnumeric_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25969,16 +37279,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
- all: docs-am all-recursive
+@@ -581,7 +582,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*) \
-@@ -567,9 +570,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25988,11 +37298,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- tools/kfile-plugins/koffice/Makefile.in
++++ tools/kfile-plugins/koffice/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
- mostlyclean-libtool:
---- tools/kfile-plugins/abiword/Makefile.in
-+++ tools/kfile-plugins/abiword/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_koffice_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26002,7 +37327,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26011,7 +37336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26023,9 +37348,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- tools/kfile-plugins/gnumeric/Makefile.in
-+++ tools/kfile-plugins/gnumeric/Makefile.in
-@@ -277,6 +277,9 @@
+--- tools/kfile-plugins/Makefile.in
++++ tools/kfile-plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26035,16 +37366,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.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*) \
-@@ -610,9 +613,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26054,11 +37385,26 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
---- tools/kfile-plugins/koffice/Makefile.in
-+++ tools/kfile-plugins/koffice/Makefile.in
-@@ -277,6 +277,9 @@
+
+ mostlyclean-libtool:
+--- tools/kfile-plugins/ooo/Makefile.in
++++ tools/kfile-plugins/ooo/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(kfile_ooo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26068,7 +37414,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26077,7 +37423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26089,9 +37435,37 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- tools/kfile-plugins/ooo/Makefile.in
-+++ tools/kfile-plugins/ooo/Makefile.in
-@@ -277,6 +277,9 @@
+--- tools/kthesaurus/Makefile.in
++++ tools/kthesaurus/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,10 +17,6 @@
+
+
+
+-#>- SOURCES = $(kthesaurus_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kthesaurus_la_SOURCES) $(kthesaurus_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -102,7 +98,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kthesaurus_la_SOURCES)
++#>- SOURCES = $(kthesaurus_la_SOURCES)
++#>+ 1
++SOURCES = $(kthesaurus_la_SOURCES) $(kthesaurus_SOURCES)
+ #>- DIST_SOURCES = $(kthesaurus_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kthesaurus_la_SOURCES) $(kthesaurus_SOURCES)
+@@ -294,6 +292,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26101,16 +37475,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .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*) \
-@@ -610,9 +613,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26120,11 +37494,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- tools/kthesaurus/Makefile.in
-+++ tools/kthesaurus/Makefile.in
-@@ -290,6 +290,9 @@
+--- tools/Makefile.in
++++ tools/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -249,6 +249,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26134,16 +37514,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -534,7 +537,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cc .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*) \
-@@ -620,9 +623,9 @@
+@@ -572,9 +575,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26153,11 +37533,17 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
--- tools/quickprint/Makefile.in
+++ tools/quickprint/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -243,6 +243,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26167,7 +37553,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -529,7 +532,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26176,7 +37562,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -567,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26190,6 +37576,12 @@
mostlyclean-libtool:
--- tools/spell/Makefile.in
+++ tools/spell/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
@@ -253,6 +253,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -26200,7 +37592,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -537,7 +540,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -26209,7 +37601,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26223,7 +37615,22 @@
mostlyclean-libtool:
--- tools/thesaurus/Makefile.in
+++ tools/thesaurus/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -17,8 +17,6 @@
+
+
+
+-SOURCES = $(libthesaurustool_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26233,7 +37640,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -26242,7 +37649,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26256,7 +37663,22 @@
@$(NORMAL_INSTALL)
--- tools/thumbnail/Makefile.in
+++ tools/thumbnail/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 483858 $
+ # @configure_input@
+
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(clipartthumbnail_la_SOURCES) $(kofficethumbnail_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26266,7 +37688,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26275,7 +37697,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -620,9 +621,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