[Pkg-kde-commits] rev 1117 - in branches/kde-3.4.0/packages/kdeaccessibility/debian: . patches
Pierre Habouzit
madcoder-guest@costa.debian.org
Tue, 24 May 2005 22:35:17 +0000
Author: madcoder-guest
Date: 2005-05-24 22:35:15 +0000 (Tue, 24 May 2005)
New Revision: 1117
Modified:
branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog
branches/kde-3.4.0/packages/kdeaccessibility/debian/patches/98_buildprep.diff
Log:
kdeaccessibility 3.4.1 : buildprep
Modified: branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog 2005-05-24 21:56:24 UTC (rev 1116)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/changelog 2005-05-24 22:35:15 UTC (rev 1117)
@@ -1,3 +1,9 @@
+kdeaccessibility (4:3.4.1-0pre1) alioth; urgency=low
+
+ * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 25 May 2005 00:28:11 +0200
+
kdeaccessibility (4:3.4.0-0pre1) alioth; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdeaccessibility/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeaccessibility/debian/patches/98_buildprep.diff 2005-05-24 21:56:24 UTC (rev 1116)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/patches/98_buildprep.diff 2005-05-24 22:35:15 UTC (rev 1117)
@@ -1,168 +1,7 @@
-diff -Nrua kdeaccessibility-3.4.0.orig/IconThemes/Makefile.in kdeaccessibility-3.4.0/IconThemes/Makefile.in
---- kdeaccessibility-3.4.0.orig/IconThemes/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/IconThemes/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -169,6 +169,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@
-@@ -342,7 +345,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*) \
-@@ -380,9 +383,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:
-diff -Nrua kdeaccessibility-3.4.0.orig/Makefile.in kdeaccessibility-3.4.0/Makefile.in
---- kdeaccessibility-3.4.0.orig/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -202,6 +202,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@
-@@ -378,7 +381,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -420,12 +423,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
-@@ -437,7 +440,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 $@
-@@ -462,7 +465,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -474,7 +483,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -482,7 +491,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -503,7 +518,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -841,7 +856,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=configure.in subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in acinclude.m4 kdeaccessibility.lsm Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in configure.in subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in acinclude.m4 kdeaccessibility.lsm configure Makefile.am Makefile.am.in
-
- #>+ 2
- docs-am:
-diff -Nrua kdeaccessibility-3.4.0.orig/acinclude.m4 kdeaccessibility-3.4.0/acinclude.m4
---- kdeaccessibility-3.4.0.orig/acinclude.m4 2005-03-04 07:05:11.000000000 -0500
-+++ kdeaccessibility-3.4.0/acinclude.m4 2005-03-04 23:43:25.000000000 -0500
-@@ -1682,15 +1682,6 @@
+diff -rua kdeaccessibility-3.4.1.orig/acinclude.m4 kdeaccessibility-3.4.1/acinclude.m4
+--- kdeaccessibility-3.4.1.orig/acinclude.m4 2005-05-23 17:39:39.000000000 +0200
++++ kdeaccessibility-3.4.1/acinclude.m4 2005-05-25 00:25:54.297436722 +0200
+@@ -1690,15 +1690,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -178,7 +17,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2131,9 +2122,6 @@
+@@ -2139,9 +2130,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -188,7 +27,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5686,6 +5674,7 @@
+@@ -5770,6 +5758,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -196,7 +35,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5734,7 @@
+@@ -5829,7 +5818,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -205,7 +44,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6148,11 @@
+@@ -6243,12 +6232,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -219,7 +58,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6260,7 +6248,6 @@
esac
;;
*64-bit*)
@@ -227,7 +66,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6293,7 @@
+@@ -6390,7 +6377,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -236,7 +75,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6419,20 +6406,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -268,7 +107,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.
-@@ -6498,7 +6491,7 @@
+@@ -6582,7 +6575,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -277,7 +116,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6580,6 @@
+@@ -6671,13 +6664,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -291,7 +130,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6617,8 +6603,11 @@
+@@ -6701,8 +6687,11 @@
fi
fi
chmod u+w .
@@ -305,7 +144,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6819,7 +6808,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -314,7 +153,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6737,7 @@
+@@ -6832,7 +6821,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -323,7 +162,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6747,20 @@
+@@ -6842,7 +6831,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -345,7 +184,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6825,7 @@
+@@ -6907,7 +6909,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -354,7 +193,7 @@
;;
beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6932,7 +6934,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -363,7 +202,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6915,7 @@
+@@ -6997,7 +6999,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -372,7 +211,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"`
-@@ -6936,7 +6938,7 @@
+@@ -7020,7 +7022,7 @@
dynamic_linker=no
;;
@@ -381,7 +220,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +6998,7 @@
+@@ -7080,7 +7082,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -390,7 +229,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7013,7 @@
+@@ -7095,7 +7097,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -399,7 +238,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7022,7 +7024,7 @@
+@@ -7106,7 +7108,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -408,7 +247,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7084,22 +7086,19 @@
+@@ -7168,22 +7170,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'
@@ -437,7 +276,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,
-@@ -7109,6 +7108,30 @@
+@@ -7193,6 +7192,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -468,7 +307,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7141,7 @@
+@@ -7202,7 +7225,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -477,7 +316,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7170,7 @@
+@@ -7231,7 +7254,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -486,7 +325,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
-@@ -7167,7 +7190,7 @@
+@@ -7251,7 +7274,7 @@
os2*)
libname_spec='$name'
@@ -495,7 +334,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7781,23 @@
+@@ -7842,31 +7865,23 @@
;;
cygwin*)
@@ -536,7 +375,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7836,21 @@
+@@ -7905,42 +7920,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -586,7 +425,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
-@@ -7885,9 +7879,6 @@
+@@ -7969,9 +7963,6 @@
;;
osf3* | osf4* | osf5*)
@@ -596,7 +435,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7888,6 @@
+@@ -7981,7 +7972,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -604,7 +443,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8153,7 @@
+@@ -8247,7 +8237,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])
@@ -613,7 +452,7 @@
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
-@@ -8213,7 +8203,7 @@
+@@ -8297,7 +8287,7 @@
fi
;;
@@ -622,7 +461,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8213,29 @@
+@@ -8307,29 +8297,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -666,7 +505,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8253,8 +8243,8 @@
+@@ -8337,8 +8327,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -677,7 +516,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8352,8 @@
+@@ -8446,8 +8436,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
@@ -688,7 +527,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8389,7 +8379,7 @@
+@@ -8473,7 +8463,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.
@@ -697,7 +536,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8409,22 @@
+@@ -8503,8 +8493,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -722,7 +561,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8470,16 @@
+@@ -8550,15 +8554,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -743,7 +582,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8483,13 +8488,12 @@
+@@ -8567,13 +8572,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -759,7 +598,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8508,7 @@
+@@ -8588,7 +8592,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -768,7 +607,7 @@
fi
fi
;;
-@@ -8521,12 +8525,12 @@
+@@ -8605,12 +8609,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'
@@ -783,7 +622,7 @@
# 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
-@@ -8535,7 +8539,7 @@
+@@ -8619,7 +8623,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -792,7 +631,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8550,20 @@
+@@ -8630,20 +8634,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -823,7 +662,7 @@
fi
;;
esac
-@@ -8569,19 +8573,19 @@
+@@ -8653,19 +8657,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -849,7 +688,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8616,7 +8620,7 @@
+@@ -8700,7 +8704,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -858,7 +697,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8638,7 +8642,7 @@
+@@ -8722,7 +8726,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -867,7 +706,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8647,11 +8651,11 @@
+@@ -8731,11 +8735,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.
@@ -881,7 +720,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8712,7 @@
+@@ -8792,7 +8796,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -890,7 +729,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8733,7 @@
+@@ -8813,7 +8817,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -899,7 +738,7 @@
;;
esac
fi
-@@ -8744,7 +8748,7 @@
+@@ -8828,7 +8832,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -908,7 +747,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8755,9 +8759,9 @@
+@@ -8839,9 +8843,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -920,7 +759,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8778,8 @@
+@@ -8858,8 +8862,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -931,7 +770,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8797,16 +8801,16 @@
+@@ -8881,16 +8885,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -952,7 +791,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8848,7 @@
+@@ -8928,7 +8932,7 @@
;;
esac
;;
@@ -961,7 +800,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=
-@@ -8863,7 +8867,7 @@
+@@ -8947,7 +8951,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -970,7 +809,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8884,7 @@
+@@ -8964,7 +8968,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -979,7 +818,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8902,7 @@
+@@ -8982,7 +8986,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -988,7 +827,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8927,7 @@
+@@ -9007,7 +9011,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -997,7 +836,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8943,10 @@
+@@ -9023,10 +9027,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -1010,7 +849,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +8965,7 @@
+@@ -9045,7 +9049,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1019,7 +858,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9022,9 @@
+@@ -9102,9 +9106,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -1031,7 +870,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9058,7 @@
+@@ -9138,7 +9142,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -1040,7 +879,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9064,9 +9068,9 @@
+@@ -9148,9 +9152,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
@@ -1052,7 +891,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9079,9 @@
+@@ -9159,9 +9163,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1064,7 +903,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9249,7 @@
+@@ -9329,7 +9333,7 @@
fi
;;
@@ -1073,7 +912,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9354,7 +9358,7 @@
+@@ -9438,7 +9442,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1082,7 +921,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9500,12 @@
+@@ -9580,11 +9584,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1097,7 +936,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9550,7 +9555,7 @@
+@@ -9634,7 +9639,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1106,7 +945,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9681,7 +9686,7 @@
+@@ -9765,7 +9770,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1115,7 +954,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9717,7 @@
+@@ -9796,7 +9801,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1124,7 +963,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +9961,10 @@
+@@ -10040,7 +10045,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.
@@ -1136,7 +975,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10037,7 @@
+@@ -10113,7 +10121,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1145,7 +984,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10055,7 @@
+@@ -10131,7 +10139,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1154,7 +993,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10346,7 +10354,7 @@
;;
esac
;;
@@ -1163,7 +1002,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10321,7 @@
+@@ -10397,7 +10405,7 @@
_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)='-static'
@@ -1172,7 +1011,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10346,7 @@
+@@ -10422,7 +10430,7 @@
;;
esac
;;
@@ -1181,7 +1020,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10657,9 @@
+@@ -10733,6 +10741,9 @@
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'
;;
@@ -1191,7 +1030,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10684,7 @@
+@@ -10757,7 +10768,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1200,7 +1039,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*
-@@ -10747,7 +10758,7 @@
+@@ -10831,7 +10842,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1209,7 +1048,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10768,13 @@
+@@ -10841,13 +10852,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'
@@ -1225,7 +1064,7 @@
# 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
-@@ -10772,19 +10783,19 @@
+@@ -10856,19 +10867,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1249,7 +1088,7 @@
fi
;;
-@@ -10802,8 +10813,8 @@
+@@ -10886,8 +10897,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1260,7 +1099,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10827,36 @@
+@@ -10900,10 +10911,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1299,7 +1138,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10906,20 @@
+@@ -10953,9 +10990,20 @@
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
@@ -1322,7 +1161,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +10965,29 @@
+@@ -11001,29 +11049,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1361,7 +1200,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11002,7 @@
+@@ -11038,7 +11086,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -1370,7 +1209,7 @@
fi
fi
;;
-@@ -10977,13 +11025,13 @@
+@@ -11061,13 +11109,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1387,7 +1226,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -10997,21 +11045,21 @@
+@@ -11081,21 +11129,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1422,7 +1261,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11068,26 @@
+@@ -11104,26 +11152,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1457,7 +1296,7 @@
;;
dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11156,8 +11204,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1468,7 +1307,7 @@
_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
-@@ -11081,7 +11129,7 @@
+@@ -11165,7 +11213,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1477,7 +1316,7 @@
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
-@@ -11099,10 +11147,10 @@
+@@ -11183,10 +11231,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1490,7 +1329,7 @@
;;
esac
else
-@@ -11149,7 +11197,7 @@
+@@ -11233,7 +11281,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1499,7 +1338,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'
-@@ -11159,7 +11207,7 @@
+@@ -11243,7 +11291,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1508,7 +1347,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
-@@ -11182,7 +11230,7 @@
+@@ -11266,7 +11314,7 @@
_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
@@ -1517,7 +1356,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11192,7 +11240,7 @@
+@@ -11276,7 +11324,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1526,7 +1365,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11251,14 @@
+@@ -11287,14 +11335,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
@@ -1543,7 +1382,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'
-@@ -11222,7 +11270,7 @@
+@@ -11306,7 +11354,7 @@
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}\*'
@@ -1552,7 +1391,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11247,9 +11295,9 @@
+@@ -11331,9 +11379,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1564,7 +1403,7 @@
else
_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~
-@@ -11269,7 +11317,7 @@
+@@ -11353,7 +11401,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.
@@ -1573,7 +1412,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11377,9 @@
+@@ -11413,9 +11461,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1585,7 +1424,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11437,7 @@
+@@ -11473,7 +11521,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1594,7 +1433,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11596,8 @@
+@@ -11632,8 +11680,8 @@
fi
done
done
@@ -1604,361 +1443,25 @@
AC_MSG_RESULT([$SED])
])
-diff -Nrua kdeaccessibility-3.4.0.orig/aclocal.m4 kdeaccessibility-3.4.0/aclocal.m4
---- kdeaccessibility-3.4.0.orig/aclocal.m4 2005-03-04 07:05:23.000000000 -0500
-+++ kdeaccessibility-3.4.0/aclocal.m4 2005-03-04 23:43:47.000000000 -0500
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,23 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--# -*- Autoconf -*-
--# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
-@@ -40,26 +28,15 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.9.1])])
--
--# AM_AUX_DIR_EXPAND
-+ [AM_AUTOMAKE_VERSION([1.9.5])])
-
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-@@ -106,26 +83,16 @@
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
-
--# AM_CONDITIONAL -*- Autoconf -*-
--
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
-+# AM_CONDITIONAL -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 6
-+# serial 7
-
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -149,26 +116,15 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
-
--# serial 7 -*- Autoconf -*-
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+# serial 8
-
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -177,7 +133,6 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -317,27 +272,16 @@
- AC_SUBST([AMDEPBACKSLASH])
- ])
-
--# Generate code to set up dependency tracking. -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--#serial 2
-+#serial 3
-
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -396,54 +340,31 @@
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
-
--# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 7
-+# serial 8
-
- # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
--# Do all the work for Automake. -*- Autoconf -*-
--
--# This macro actually does too much some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
-+# Do all the work for Automake. -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 12
-
--# serial 11
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -545,51 +466,27 @@
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
-
--# -*- Autoconf -*-
--# Copyright (C) 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 1
-+# serial 2
-
- # Check whether the underlying file-system supports filenames
- # with a leading dot. For instance MS-DOS doesn't.
-@@ -604,26 +501,44 @@
+diff -rua kdeaccessibility-3.4.1.orig/aclocal.m4 kdeaccessibility-3.4.1/aclocal.m4
+--- kdeaccessibility-3.4.1.orig/aclocal.m4 2005-05-23 17:39:56.000000000 +0200
++++ kdeaccessibility-3.4.1/aclocal.m4 2005-05-25 00:26:02.753675399 +0200
+@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
--# Check to see how 'make' treats includes. -*- Autoconf -*-
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
-
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
++
+# serial 4
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
++
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
@@ -1973,232 +1476,15 @@
+ AC_SUBST(MAINT)dnl
+]
+)
-
--# serial 2
++
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -667,27 +582,16 @@
- rm -f confinc confmf
- ])
-
--# -*- Autoconf -*-
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 3
-+# serial 4
-
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -713,27 +617,16 @@
- fi
- ])
-
-+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_MKDIR_P
- # ---------------
- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+#
- # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
- # created by `make install' are always world readable, even if the
- # installer happens to have an overly restrictive umask (e.g. 077).
-@@ -787,26 +680,15 @@
- fi
- AC_SUBST([mkdir_p])])
-
--# Helper functions for option handling. -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Helper functions for option handling. -*- Autoconf -*-
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 2
-+# serial 3
-
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -831,28 +713,16 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 3
-+# serial 4
-
- # AM_SANITY_CHECK
- # ---------------
-@@ -895,25 +765,14 @@
- fi
- AC_MSG_RESULT(yes)])
-
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries. This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -936,25 +795,13 @@
-
- # Check how to create a tarball. -*- Autoconf -*-
-
--# Copyright (C) 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 1
-+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# serial 2
-
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-diff -Nrua kdeaccessibility-3.4.0.orig/configure kdeaccessibility-3.4.0/configure
---- kdeaccessibility-3.4.0.orig/configure 2005-03-04 07:05:53.000000000 -0500
-+++ kdeaccessibility-3.4.0/configure 2005-03-04 23:45:12.000000000 -0500
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+diff -rua kdeaccessibility-3.4.1.orig/configure kdeaccessibility-3.4.1/configure
+--- kdeaccessibility-3.4.1.orig/configure 2005-05-23 17:40:37.000000000 +0200
++++ kdeaccessibility-3.4.1/configure 2005-05-25 00:26:27.892412060 +0200
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -2358,17 +1644,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4291,8 +4308,7 @@
+@@ -4268,8 +4285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4380,8 +4396,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4380,8 +4396,7 @@
+@@ -4469,8 +4484,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2378,7 +1674,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4483,8 +4498,7 @@
+@@ -4572,8 +4586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2388,7 +1684,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4583,8 +4597,7 @@
+@@ -4672,8 +4685,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2398,7 +1694,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4668,8 +4681,7 @@
+@@ -4757,8 +4769,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2408,7 +1704,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4758,8 +4770,7 @@
+@@ -4847,8 +4858,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2418,7 +1714,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4846,8 +4857,7 @@
+@@ -4935,8 +4945,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2428,7 +1724,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4934,8 +4944,7 @@
+@@ -5023,8 +5032,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2438,7 +1734,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5041,8 +5050,7 @@
+@@ -5130,8 +5138,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2448,7 +1744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5129,8 +5137,7 @@
+@@ -5218,8 +5225,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2458,7 +1754,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5217,8 +5224,7 @@
+@@ -5306,8 +5312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2468,7 +1764,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5305,8 +5311,7 @@
+@@ -5394,8 +5399,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2478,7 +1774,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5437,8 +5442,7 @@
+@@ -5526,8 +5530,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2488,7 +1784,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5526,8 +5530,7 @@
+@@ -5615,8 +5618,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2498,7 +1794,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5614,8 +5617,7 @@
+@@ -5703,8 +5705,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2508,7 +1804,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5702,8 +5704,7 @@
+@@ -5791,8 +5792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2518,7 +1814,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5790,8 +5791,7 @@
+@@ -5879,8 +5879,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2528,7 +1824,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5878,8 +5878,7 @@
+@@ -5967,8 +5966,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2538,7 +1834,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6302,8 +6301,7 @@
+@@ -6391,8 +6389,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2548,7 +1844,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6429,8 +6427,7 @@
+@@ -6518,8 +6515,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2558,7 +1854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6518,8 +6515,7 @@
+@@ -6607,8 +6603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2568,7 +1864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6602,185 +6598,6 @@
+@@ -6691,185 +6686,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -2754,7 +2050,7 @@
fi
-@@ -6969,10 +6786,10 @@
+@@ -7058,10 +6874,10 @@
fi
done
done
@@ -2766,7 +2062,7 @@
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
-@@ -7206,31 +7023,23 @@
+@@ -7295,31 +7111,23 @@
;;
cygwin*)
@@ -2806,7 +2102,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7269,42 +7078,21 @@
+@@ -7358,42 +7166,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -2856,7 +2152,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
-@@ -7333,9 +7121,6 @@
+@@ -7422,9 +7209,6 @@
;;
osf3* | osf4* | osf5*)
@@ -2866,7 +2162,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7345,7 +7130,6 @@
+@@ -7434,7 +7218,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -2874,16 +2170,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7422,7 +7206,7 @@
+@@ -7511,7 +7294,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7425 "configure"' > conftest.$ac_ext
-+ echo '#line 7209 "configure"' > conftest.$ac_ext
+- echo '#line 7514 "configure"' > conftest.$ac_ext
++ echo '#line 7297 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7467,12 +7251,11 @@
+@@ -7556,12 +7339,11 @@
(exit $ac_status); }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -2897,7 +2193,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7484,7 +7267,6 @@
+@@ -7573,7 +7355,6 @@
esac
;;
*64-bit*)
@@ -2905,7 +2201,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7544,8 +7326,7 @@
+@@ -7633,8 +7414,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2915,7 +2211,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7620,8 +7401,7 @@
+@@ -7709,8 +7489,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2925,7 +2221,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7791,8 +7571,7 @@
+@@ -7880,8 +7659,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2935,7 +2231,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7859,8 +7638,7 @@
+@@ -7948,8 +7726,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2945,16 +2241,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8067,7 +7845,7 @@
+@@ -8156,7 +7933,7 @@
# Provide some information about the compiler.
--echo "$as_me:8070:" \
-+echo "$as_me:7848:" \
+-echo "$as_me:8159:" \
++echo "$as_me:7936:" \
"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
-@@ -8113,8 +7891,7 @@
+@@ -8202,8 +7979,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2964,7 +2260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8163,8 +7940,7 @@
+@@ -8252,8 +8028,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2974,7 +2270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8222,7 +7998,7 @@
+@@ -8311,7 +8086,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -2983,7 +2279,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8251,20 +8027,26 @@
+@@ -8340,20 +8115,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -3015,7 +2311,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.
-@@ -8332,7 +8114,7 @@
+@@ -8421,7 +8202,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -3024,7 +2320,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8350,7 +8132,7 @@
+@@ -8439,7 +8220,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -3033,35 +2329,35 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9099,11 +8881,11 @@
+@@ -9188,11 +8969,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9102: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8884: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9191: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8972: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9106: \$? = $ac_status" >&5
-+ echo "$as_me:8888: \$? = $ac_status" >&5
+- echo "$as_me:9195: \$? = $ac_status" >&5
++ echo "$as_me:8976: \$? = $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
-@@ -9332,11 +9114,11 @@
+@@ -9421,11 +9202,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9335: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9117: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9424: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9205: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9339: \$? = $ac_status" >&5
-+ echo "$as_me:9121: \$? = $ac_status" >&5
+- echo "$as_me:9428: \$? = $ac_status" >&5
++ echo "$as_me:9209: \$? = $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
-@@ -9383,13 +9165,6 @@
+@@ -9472,13 +9253,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3075,21 +2371,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -9399,11 +9174,11 @@
+@@ -9488,11 +9262,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9402: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9177: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9491: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9265: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9406: \$? = $ac_status" >&5
-+ echo "$as_me:9181: \$? = $ac_status" >&5
+- echo "$as_me:9495: \$? = $ac_status" >&5
++ echo "$as_me:9269: \$? = $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
-@@ -9413,8 +9188,11 @@
+@@ -9502,8 +9276,11 @@
fi
fi
chmod u+w .
@@ -3103,7 +2399,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9542,7 +9320,7 @@
+@@ -9631,7 +9408,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3112,7 +2408,7 @@
else
ld_shlibs=no
fi
-@@ -9552,13 +9330,13 @@
+@@ -9641,13 +9418,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'
@@ -3128,7 +2424,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9567,19 +9345,19 @@
+@@ -9656,19 +9433,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3152,7 +2448,7 @@
fi
;;
-@@ -9597,8 +9375,8 @@
+@@ -9686,8 +9463,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3163,7 +2459,7 @@
else
ld_shlibs=no
fi
-@@ -9611,10 +9389,36 @@
+@@ -9700,10 +9477,36 @@
hardcode_shlibpath_var=no
;;
@@ -3202,7 +2498,7 @@
else
ld_shlibs=no
fi
-@@ -9664,9 +9468,20 @@
+@@ -9753,9 +9556,20 @@
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
@@ -3225,7 +2521,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9712,21 +9527,22 @@
+@@ -9801,21 +9615,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3253,7 +2549,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9750,8 +9566,7 @@
+@@ -9839,8 +9654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3263,7 +2559,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9778,14 +9593,13 @@
+@@ -9867,14 +9681,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -3281,7 +2577,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9812,8 +9626,7 @@
+@@ -9901,8 +9714,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3291,7 +2587,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9851,7 +9664,7 @@
+@@ -9940,7 +9752,7 @@
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -3300,7 +2596,7 @@
fi
fi
;;
-@@ -9874,13 +9687,13 @@
+@@ -9963,13 +9775,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -3317,7 +2613,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.
-@@ -9894,21 +9707,21 @@
+@@ -9983,21 +9795,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -3352,7 +2648,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -9917,18 +9730,18 @@
+@@ -10006,18 +9818,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -3377,7 +2673,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -9969,8 +9782,8 @@
+@@ -10058,8 +9870,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3388,7 +2684,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9978,7 +9791,7 @@
+@@ -10067,7 +9879,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3397,7 +2693,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -9996,10 +9809,10 @@
+@@ -10085,10 +9897,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -3410,7 +2706,7 @@
;;
esac
else
-@@ -10046,7 +9859,7 @@
+@@ -10135,7 +9947,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3419,7 +2715,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'
-@@ -10056,7 +9869,7 @@
+@@ -10145,7 +9957,7 @@
link_all_deplibs=yes
;;
@@ -3428,7 +2724,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10079,7 +9892,7 @@
+@@ -10168,7 +9980,7 @@
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
@@ -3437,7 +2733,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10089,7 +9902,7 @@
+@@ -10178,7 +9990,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -3446,7 +2742,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10100,14 +9913,14 @@
+@@ -10189,14 +10001,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -3463,7 +2759,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'
-@@ -10119,7 +9932,7 @@
+@@ -10208,7 +10020,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3472,7 +2768,7 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10144,9 +9957,9 @@
+@@ -10233,9 +10045,9 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -3484,7 +2780,7 @@
else
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~
-@@ -10166,7 +9979,7 @@
+@@ -10255,7 +10067,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.
@@ -3493,7 +2789,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10226,9 +10039,9 @@
+@@ -10315,9 +10127,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -3505,7 +2801,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10334,7 +10147,7 @@
+@@ -10423,7 +10235,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -3514,7 +2810,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10344,7 +10157,20 @@
+@@ -10433,7 +10245,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3536,7 +2832,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10409,7 +10235,7 @@
+@@ -10498,7 +10323,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3545,7 +2841,7 @@
;;
beos*)
-@@ -10434,7 +10260,7 @@
+@@ -10523,7 +10348,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -3554,7 +2850,7 @@
need_version=no
need_lib_prefix=no
-@@ -10499,7 +10325,7 @@
+@@ -10588,7 +10413,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -3563,7 +2859,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"`
-@@ -10522,7 +10348,7 @@
+@@ -10611,7 +10436,7 @@
dynamic_linker=no
;;
@@ -3572,7 +2868,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10582,7 +10408,7 @@
+@@ -10671,7 +10496,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -3581,7 +2877,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10597,7 +10423,7 @@
+@@ -10686,7 +10511,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -3590,7 +2886,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10608,7 +10434,7 @@
+@@ -10697,7 +10522,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -3599,7 +2895,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10670,22 +10496,19 @@
+@@ -10759,22 +10584,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'
@@ -3628,7 +2924,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,
-@@ -10695,6 +10518,30 @@
+@@ -10784,6 +10606,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3659,7 +2955,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10704,7 +10551,7 @@
+@@ -10793,7 +10639,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3668,7 +2964,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10733,7 +10580,7 @@
+@@ -10822,7 +10668,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3677,7 +2973,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
-@@ -10753,7 +10600,7 @@
+@@ -10842,7 +10688,7 @@
os2*)
libname_spec='$name'
@@ -3686,7 +2982,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10982,8 +10829,7 @@
+@@ -11071,8 +10917,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3696,7 +2992,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11086,8 +10932,7 @@
+@@ -11175,8 +11020,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3706,7 +3002,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11152,8 +10997,7 @@
+@@ -11241,8 +11085,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3716,7 +3012,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11246,8 +11090,7 @@
+@@ -11335,8 +11178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3726,7 +3022,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11312,8 +11155,7 @@
+@@ -11401,8 +11243,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3736,7 +3032,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11379,8 +11221,7 @@
+@@ -11468,8 +11309,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3746,7 +3042,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11446,8 +11287,7 @@
+@@ -11535,8 +11375,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3756,25 +3052,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11522,7 +11362,7 @@
+@@ -11611,7 +11450,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11525 "configure"
-+#line 11365 "configure"
+-#line 11614 "configure"
++#line 11453 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11620,7 +11460,7 @@
+@@ -11709,7 +11548,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11623 "configure"
-+#line 11463 "configure"
+-#line 11712 "configure"
++#line 11551 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11745,7 +11585,7 @@
+@@ -11834,7 +11673,7 @@
fi
;;
@@ -3783,7 +3079,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11755,29 +11595,29 @@
+@@ -11844,29 +11683,29 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -3827,7 +3123,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -11811,7 +11651,8 @@
+@@ -11900,7 +11739,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.
@@ -3837,7 +3133,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -11989,7 +11830,7 @@
+@@ -12078,7 +11918,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -3846,7 +3142,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12020,7 +11861,7 @@
+@@ -12109,7 +11949,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -3855,7 +3151,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12262,7 +12103,10 @@
+@@ -12351,7 +12191,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.
@@ -3867,7 +3163,7 @@
fi
-@@ -12530,8 +12374,8 @@
+@@ -12619,8 +12462,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
@@ -3878,7 +3174,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12557,7 +12401,7 @@
+@@ -12646,7 +12489,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.
@@ -3887,7 +3183,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12588,8 +12432,22 @@
+@@ -12677,8 +12520,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -3912,7 +3208,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12635,15 +12493,16 @@
+@@ -12724,15 +12581,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3933,7 +3229,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12673,8 +12532,7 @@
+@@ -12762,8 +12620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3943,7 +3239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12703,13 +12561,12 @@
+@@ -12792,13 +12649,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -3959,7 +3255,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12736,8 +12593,7 @@
+@@ -12825,8 +12681,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3969,7 +3265,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12775,7 +12631,7 @@
+@@ -12864,7 +12719,7 @@
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -3978,7 +3274,7 @@
fi
fi
;;
-@@ -12792,12 +12648,12 @@
+@@ -12881,12 +12736,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'
@@ -3993,7 +3289,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12806,7 +12662,7 @@
+@@ -12895,7 +12750,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4002,7 +3298,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -12817,20 +12673,20 @@
+@@ -12906,20 +12761,20 @@
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -4033,7 +3329,7 @@
fi
;;
esac
-@@ -12840,19 +12696,19 @@
+@@ -12929,19 +12784,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -4059,7 +3355,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
-@@ -12887,7 +12743,7 @@
+@@ -12976,7 +12831,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -4068,7 +3364,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12909,7 +12765,7 @@
+@@ -12998,7 +12853,7 @@
ld_shlibs_CXX=no
;;
aCC)
@@ -4077,7 +3373,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12918,11 +12774,11 @@
+@@ -13007,11 +12862,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.
@@ -4091,7 +3387,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12979,7 +12835,7 @@
+@@ -13068,7 +12923,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -4100,7 +3396,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13000,7 +12856,7 @@
+@@ -13089,7 +12944,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -4109,7 +3405,7 @@
;;
esac
fi
-@@ -13015,7 +12871,7 @@
+@@ -13104,7 +12959,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -4118,7 +3414,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13026,9 +12882,9 @@
+@@ -13115,9 +12970,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -4130,7 +3426,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13045,8 +12901,8 @@
+@@ -13134,8 +12989,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -4141,7 +3437,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13068,16 +12924,16 @@
+@@ -13157,16 +13012,16 @@
# Intel C++
with_gnu_ld=yes
archive_cmds_need_lc_CXX=no
@@ -4162,7 +3458,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13115,7 +12971,7 @@
+@@ -13204,7 +13059,7 @@
;;
esac
;;
@@ -4171,7 +3467,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=
-@@ -13134,7 +12990,7 @@
+@@ -13223,7 +13078,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -4180,7 +3476,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13151,7 +13007,7 @@
+@@ -13240,7 +13095,7 @@
;;
cxx)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4189,7 +3485,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13169,7 +13025,7 @@
+@@ -13258,7 +13113,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4198,7 +3494,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13194,7 +13050,7 @@
+@@ -13283,7 +13138,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -4207,7 +3503,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13210,10 +13066,10 @@
+@@ -13299,10 +13154,10 @@
;;
cxx)
allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -4220,7 +3516,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13232,7 +13088,7 @@
+@@ -13321,7 +13176,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4229,7 +3525,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13289,9 +13145,9 @@
+@@ -13378,9 +13233,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
no_undefined_flag_CXX=' -zdefs'
@@ -4241,7 +3537,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -13325,7 +13181,7 @@
+@@ -13414,7 +13269,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -4250,7 +3546,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13335,9 +13191,9 @@
+@@ -13424,9 +13279,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
@@ -4262,7 +3558,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13346,9 +13202,9 @@
+@@ -13435,9 +13290,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -4274,7 +3570,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13463,7 +13319,7 @@
+@@ -13552,7 +13407,7 @@
fi
;;
@@ -4283,7 +3579,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13598,7 +13454,7 @@
+@@ -13687,7 +13542,7 @@
;;
esac
;;
@@ -4292,7 +3588,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13674,7 +13530,7 @@
+@@ -13763,7 +13618,7 @@
;;
esac
;;
@@ -4301,21 +3597,21 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13785,11 +13641,11 @@
+@@ -13874,11 +13729,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13788: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13644: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13877: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13732: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13792: \$? = $ac_status" >&5
-+ echo "$as_me:13648: \$? = $ac_status" >&5
+- echo "$as_me:13881: \$? = $ac_status" >&5
++ echo "$as_me:13736: \$? = $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
-@@ -13836,13 +13692,6 @@
+@@ -13925,13 +13780,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4329,21 +3625,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -13852,11 +13701,11 @@
+@@ -13941,11 +13789,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13855: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13704: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13944: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13792: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13859: \$? = $ac_status" >&5
-+ echo "$as_me:13708: \$? = $ac_status" >&5
+- echo "$as_me:13948: \$? = $ac_status" >&5
++ echo "$as_me:13796: \$? = $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
-@@ -13866,8 +13715,11 @@
+@@ -13955,8 +13803,11 @@
fi
fi
chmod u+w .
@@ -4357,7 +3653,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13919,6 +13771,9 @@
+@@ -14008,6 +13859,9 @@
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'
;;
@@ -4367,7 +3663,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14000,7 +13855,7 @@
+@@ -14089,7 +13943,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4376,7 +3672,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14010,7 +13865,20 @@
+@@ -14099,7 +13953,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4398,7 +3694,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14075,7 +13943,7 @@
+@@ -14164,7 +14031,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4407,7 +3703,7 @@
;;
beos*)
-@@ -14100,7 +13968,7 @@
+@@ -14189,7 +14056,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -4416,7 +3712,7 @@
need_version=no
need_lib_prefix=no
-@@ -14165,7 +14033,7 @@
+@@ -14254,7 +14121,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -4425,7 +3721,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"`
-@@ -14188,7 +14056,7 @@
+@@ -14277,7 +14144,7 @@
dynamic_linker=no
;;
@@ -4434,7 +3730,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14248,7 +14116,7 @@
+@@ -14337,7 +14204,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -4443,7 +3739,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14263,7 +14131,7 @@
+@@ -14352,7 +14219,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4452,7 +3748,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14274,7 +14142,7 @@
+@@ -14363,7 +14230,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4461,7 +3757,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14336,22 +14204,19 @@
+@@ -14425,22 +14292,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'
@@ -4490,7 +3786,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,
-@@ -14361,6 +14226,30 @@
+@@ -14450,6 +14314,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4521,7 +3817,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14370,7 +14259,7 @@
+@@ -14459,7 +14347,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4530,7 +3826,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14399,7 +14288,7 @@
+@@ -14488,7 +14376,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -4539,7 +3835,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
-@@ -14419,7 +14308,7 @@
+@@ -14508,7 +14396,7 @@
os2*)
libname_spec='$name'
@@ -4548,7 +3844,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14648,8 +14537,7 @@
+@@ -14737,8 +14625,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4558,7 +3854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14752,8 +14640,7 @@
+@@ -14841,8 +14728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4568,7 +3864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14818,8 +14705,7 @@
+@@ -14907,8 +14793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4578,7 +3874,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14912,8 +14798,7 @@
+@@ -15001,8 +14886,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4588,7 +3884,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14978,8 +14863,7 @@
+@@ -15067,8 +14951,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4598,7 +3894,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15045,8 +14929,7 @@
+@@ -15134,8 +15017,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4608,7 +3904,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15112,8 +14995,7 @@
+@@ -15201,8 +15083,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4618,25 +3914,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15188,7 +15070,7 @@
+@@ -15277,7 +15158,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15191 "configure"
-+#line 15073 "configure"
+-#line 15280 "configure"
++#line 15161 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15286,7 +15168,7 @@
+@@ -15375,7 +15256,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15289 "configure"
-+#line 15171 "configure"
+-#line 15378 "configure"
++#line 15259 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15403,7 +15285,8 @@
+@@ -15492,7 +15373,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.
@@ -4646,7 +3942,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15533,7 +15416,7 @@
+@@ -15622,7 +15504,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4655,7 +3951,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15564,7 +15447,7 @@
+@@ -15653,7 +15535,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4664,7 +3960,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15781,7 +15664,10 @@
+@@ -15870,7 +15752,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.
@@ -4676,7 +3972,7 @@
fi
-@@ -15883,7 +15769,7 @@
+@@ -15972,7 +15857,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -4685,21 +3981,21 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -16109,11 +15995,11 @@
+@@ -16198,11 +16083,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16112: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15998: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16201: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16086: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16116: \$? = $ac_status" >&5
-+ echo "$as_me:16002: \$? = $ac_status" >&5
+- echo "$as_me:16205: \$? = $ac_status" >&5
++ echo "$as_me:16090: \$? = $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
-@@ -16160,13 +16046,6 @@
+@@ -16249,13 +16134,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4713,21 +4009,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16176,11 +16055,11 @@
+@@ -16265,11 +16143,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16179: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16058: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16268: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16146: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16183: \$? = $ac_status" >&5
-+ echo "$as_me:16062: \$? = $ac_status" >&5
+- echo "$as_me:16272: \$? = $ac_status" >&5
++ echo "$as_me:16150: \$? = $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
-@@ -16190,8 +16069,11 @@
+@@ -16279,8 +16157,11 @@
fi
fi
chmod u+w .
@@ -4741,7 +4037,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16319,7 +16201,7 @@
+@@ -16408,7 +16289,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4750,7 +4046,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16329,13 +16211,13 @@
+@@ -16418,13 +16299,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'
@@ -4766,7 +4062,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16344,19 +16226,19 @@
+@@ -16433,19 +16314,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4790,7 +4086,7 @@
fi
;;
-@@ -16374,8 +16256,8 @@
+@@ -16463,8 +16344,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4801,7 +4097,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16388,10 +16270,36 @@
+@@ -16477,10 +16358,36 @@
hardcode_shlibpath_var_F77=no
;;
@@ -4840,7 +4136,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16441,9 +16349,20 @@
+@@ -16530,9 +16437,20 @@
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
@@ -4863,7 +4159,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16489,21 +16408,22 @@
+@@ -16578,21 +16496,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4891,7 +4187,7 @@
program main
end
-@@ -16517,8 +16437,7 @@
+@@ -16606,8 +16525,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4901,7 +4197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16545,14 +16464,13 @@
+@@ -16634,14 +16552,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4919,7 +4215,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16569,8 +16487,7 @@
+@@ -16658,8 +16575,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4929,7 +4225,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16608,7 +16525,7 @@
+@@ -16697,7 +16613,7 @@
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -4938,7 +4234,7 @@
fi
fi
;;
-@@ -16631,13 +16548,13 @@
+@@ -16720,13 +16636,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -4955,7 +4251,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
-@@ -16651,21 +16568,21 @@
+@@ -16740,21 +16656,21 @@
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -4990,7 +4286,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -16674,18 +16591,18 @@
+@@ -16763,18 +16679,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5015,7 +4311,7 @@
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -16726,8 +16643,8 @@
+@@ -16815,8 +16731,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5026,7 +4322,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16735,7 +16652,7 @@
+@@ -16824,7 +16740,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5035,7 +4331,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16753,10 +16670,10 @@
+@@ -16842,10 +16758,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -5048,7 +4344,7 @@
;;
esac
else
-@@ -16803,7 +16720,7 @@
+@@ -16892,7 +16808,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5057,7 +4353,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'
-@@ -16813,7 +16730,7 @@
+@@ -16902,7 +16818,7 @@
link_all_deplibs_F77=yes
;;
@@ -5066,7 +4362,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
-@@ -16836,7 +16753,7 @@
+@@ -16925,7 +16841,7 @@
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
@@ -5075,7 +4371,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16846,7 +16763,7 @@
+@@ -16935,7 +16851,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -5084,7 +4380,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16857,14 +16774,14 @@
+@@ -16946,14 +16862,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -5101,7 +4397,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'
-@@ -16876,7 +16793,7 @@
+@@ -16965,7 +16881,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -5110,7 +4406,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16901,9 +16818,9 @@
+@@ -16990,9 +16906,9 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -5122,7 +4418,7 @@
else
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~
-@@ -16923,7 +16840,7 @@
+@@ -17012,7 +16928,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.
@@ -5131,7 +4427,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16983,9 +16900,9 @@
+@@ -17072,9 +16988,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5143,7 +4439,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17091,7 +17008,7 @@
+@@ -17180,7 +17096,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5152,7 +4448,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17101,7 +17018,20 @@
+@@ -17190,7 +17106,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5174,7 +4470,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17166,7 +17096,7 @@
+@@ -17255,7 +17184,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5183,7 +4479,7 @@
;;
beos*)
-@@ -17191,7 +17121,7 @@
+@@ -17280,7 +17209,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5192,7 +4488,7 @@
need_version=no
need_lib_prefix=no
-@@ -17256,7 +17186,7 @@
+@@ -17345,7 +17274,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5201,7 +4497,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"`
-@@ -17279,7 +17209,7 @@
+@@ -17368,7 +17297,7 @@
dynamic_linker=no
;;
@@ -5210,7 +4506,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17339,7 +17269,7 @@
+@@ -17428,7 +17357,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -5219,7 +4515,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17354,7 +17284,7 @@
+@@ -17443,7 +17372,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5228,7 +4524,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17365,7 +17295,7 @@
+@@ -17454,7 +17383,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5237,7 +4533,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17427,22 +17357,19 @@
+@@ -17516,22 +17445,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'
@@ -5266,7 +4562,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,
-@@ -17452,6 +17379,30 @@
+@@ -17541,6 +17467,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5297,7 +4593,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17461,7 +17412,7 @@
+@@ -17550,7 +17500,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5306,7 +4602,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17490,7 +17441,7 @@
+@@ -17579,7 +17529,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5315,7 +4611,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
-@@ -17510,7 +17461,7 @@
+@@ -17599,7 +17549,7 @@
os2*)
libname_spec='$name'
@@ -5324,7 +4620,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17689,7 +17640,8 @@
+@@ -17778,7 +17728,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.
@@ -5334,7 +4630,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17819,7 +17771,7 @@
+@@ -17908,7 +17859,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5343,7 +4639,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17850,7 +17802,7 @@
+@@ -17939,7 +17890,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5352,7 +4648,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18067,7 +18019,10 @@
+@@ -18156,7 +18107,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.
@@ -5364,35 +4660,35 @@
fi
-@@ -18149,11 +18104,11 @@
+@@ -18238,11 +18192,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18152: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18107: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18241: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18195: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18156: \$? = $ac_status" >&5
-+ echo "$as_me:18111: \$? = $ac_status" >&5
+- echo "$as_me:18245: \$? = $ac_status" >&5
++ echo "$as_me:18199: \$? = $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
-@@ -18382,11 +18337,11 @@
+@@ -18471,11 +18425,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18385: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18340: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18474: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18428: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18389: \$? = $ac_status" >&5
-+ echo "$as_me:18344: \$? = $ac_status" >&5
+- echo "$as_me:18478: \$? = $ac_status" >&5
++ echo "$as_me:18432: \$? = $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
-@@ -18433,13 +18388,6 @@
+@@ -18522,13 +18476,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5406,21 +4702,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18449,11 +18397,11 @@
+@@ -18538,11 +18485,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18452: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18400: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18541: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18488: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18456: \$? = $ac_status" >&5
-+ echo "$as_me:18404: \$? = $ac_status" >&5
+- echo "$as_me:18545: \$? = $ac_status" >&5
++ echo "$as_me:18492: \$? = $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
-@@ -18463,8 +18411,11 @@
+@@ -18552,8 +18499,11 @@
fi
fi
chmod u+w .
@@ -5434,7 +4730,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18592,7 +18543,7 @@
+@@ -18681,7 +18631,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5443,7 +4739,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18602,13 +18553,13 @@
+@@ -18691,13 +18641,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'
@@ -5459,7 +4755,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18617,19 +18568,19 @@
+@@ -18706,19 +18656,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5483,7 +4779,7 @@
fi
;;
-@@ -18647,8 +18598,8 @@
+@@ -18736,8 +18686,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5494,7 +4790,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18661,10 +18612,36 @@
+@@ -18750,10 +18700,36 @@
hardcode_shlibpath_var_GCJ=no
;;
@@ -5533,7 +4829,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18714,9 +18691,20 @@
+@@ -18803,9 +18779,20 @@
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
@@ -5556,7 +4852,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18762,21 +18750,22 @@
+@@ -18851,21 +18838,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5584,7 +4880,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18800,8 +18789,7 @@
+@@ -18889,8 +18877,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5594,7 +4890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18828,14 +18816,13 @@
+@@ -18917,14 +18904,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5612,7 +4908,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18862,8 +18849,7 @@
+@@ -18951,8 +18937,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5622,7 +4918,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18901,7 +18887,7 @@
+@@ -18990,7 +18975,7 @@
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -5631,7 +4927,7 @@
fi
fi
;;
-@@ -18924,13 +18910,13 @@
+@@ -19013,13 +18998,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -5648,7 +4944,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
-@@ -18944,21 +18930,21 @@
+@@ -19033,21 +19018,21 @@
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -5683,7 +4979,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -18967,18 +18953,18 @@
+@@ -19056,18 +19041,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5708,7 +5004,7 @@
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -19019,8 +19005,8 @@
+@@ -19108,8 +19093,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5719,7 +5015,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19028,7 +19014,7 @@
+@@ -19117,7 +19102,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5728,7 +5024,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19046,10 +19032,10 @@
+@@ -19135,10 +19120,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -5741,7 +5037,7 @@
;;
esac
else
-@@ -19096,7 +19082,7 @@
+@@ -19185,7 +19170,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5750,7 +5046,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'
-@@ -19106,7 +19092,7 @@
+@@ -19195,7 +19180,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5759,7 +5055,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
-@@ -19129,7 +19115,7 @@
+@@ -19218,7 +19203,7 @@
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
@@ -5768,7 +5064,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19139,7 +19125,7 @@
+@@ -19228,7 +19213,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -5777,7 +5073,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19150,14 +19136,14 @@
+@@ -19239,14 +19224,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -5794,7 +5090,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'
-@@ -19169,7 +19155,7 @@
+@@ -19258,7 +19243,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5803,7 +5099,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19194,9 +19180,9 @@
+@@ -19283,9 +19268,9 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -5815,7 +5111,7 @@
else
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~
-@@ -19216,7 +19202,7 @@
+@@ -19305,7 +19290,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.
@@ -5824,7 +5120,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19276,9 +19262,9 @@
+@@ -19365,9 +19350,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5836,7 +5132,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19384,7 +19370,7 @@
+@@ -19473,7 +19458,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5845,7 +5141,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19394,7 +19380,20 @@
+@@ -19483,7 +19468,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5867,7 +5163,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19459,7 +19458,7 @@
+@@ -19548,7 +19546,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5876,7 +5172,7 @@
;;
beos*)
-@@ -19484,7 +19483,7 @@
+@@ -19573,7 +19571,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5885,7 +5181,7 @@
need_version=no
need_lib_prefix=no
-@@ -19549,7 +19548,7 @@
+@@ -19638,7 +19636,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5894,7 +5190,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"`
-@@ -19572,7 +19571,7 @@
+@@ -19661,7 +19659,7 @@
dynamic_linker=no
;;
@@ -5903,7 +5199,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19632,7 +19631,7 @@
+@@ -19721,7 +19719,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -5912,7 +5208,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19647,7 +19646,7 @@
+@@ -19736,7 +19734,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5921,7 +5217,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19658,7 +19657,7 @@
+@@ -19747,7 +19745,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5930,7 +5226,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19720,22 +19719,19 @@
+@@ -19809,22 +19807,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'
@@ -5959,7 +5255,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,
-@@ -19745,6 +19741,30 @@
+@@ -19834,6 +19829,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5990,7 +5286,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19754,7 +19774,7 @@
+@@ -19843,7 +19862,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5999,7 +5295,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19783,7 +19803,7 @@
+@@ -19872,7 +19891,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6008,7 +5304,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
-@@ -19803,7 +19823,7 @@
+@@ -19892,7 +19911,7 @@
os2*)
libname_spec='$name'
@@ -6017,7 +5313,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20032,8 +20052,7 @@
+@@ -20121,8 +20140,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6027,7 +5323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20136,8 +20155,7 @@
+@@ -20225,8 +20243,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6037,7 +5333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20202,8 +20220,7 @@
+@@ -20291,8 +20308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6047,7 +5343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20296,8 +20313,7 @@
+@@ -20385,8 +20401,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6057,7 +5353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20362,8 +20378,7 @@
+@@ -20451,8 +20466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6067,7 +5363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20429,8 +20444,7 @@
+@@ -20518,8 +20532,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6077,7 +5373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20496,8 +20510,7 @@
+@@ -20585,8 +20598,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6087,25 +5383,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20572,7 +20585,7 @@
+@@ -20661,7 +20673,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20575 "configure"
-+#line 20588 "configure"
+-#line 20664 "configure"
++#line 20676 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20670,7 +20683,7 @@
+@@ -20759,7 +20771,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20673 "configure"
-+#line 20686 "configure"
+-#line 20762 "configure"
++#line 20774 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20787,7 +20800,8 @@
+@@ -20876,7 +20888,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.
@@ -6115,7 +5411,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -20917,7 +20931,7 @@
+@@ -21006,7 +21019,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6124,7 +5420,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20948,7 +20962,7 @@
+@@ -21037,7 +21050,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6133,7 +5429,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21165,7 +21179,10 @@
+@@ -21254,7 +21267,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.
@@ -6145,7 +5441,7 @@
fi
-@@ -21228,7 +21245,8 @@
+@@ -21317,7 +21333,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.
@@ -6155,7 +5451,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21358,7 +21376,7 @@
+@@ -21447,7 +21464,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6164,7 +5460,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21389,7 +21407,7 @@
+@@ -21478,7 +21495,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6173,7 +5469,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21606,7 +21624,10 @@
+@@ -21695,7 +21712,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.
@@ -6185,7 +5481,7 @@
fi
-@@ -21653,7 +21674,7 @@
+@@ -21742,7 +21762,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -6194,7 +5490,7 @@
# Prevent multiple expansion
-@@ -21971,8 +21992,7 @@
+@@ -22060,8 +22080,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6204,7 +5500,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22046,9 +22066,6 @@
+@@ -22135,9 +22154,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6214,7 +5510,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22082,8 +22099,7 @@
+@@ -22171,8 +22187,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6224,7 +5520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22187,8 +22203,7 @@
+@@ -22276,8 +22291,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6234,7 +5530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22267,9 +22282,6 @@
+@@ -22356,9 +22370,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6244,7 +5540,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22302,8 +22314,7 @@
+@@ -22391,8 +22402,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6254,7 +5550,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22406,8 +22417,7 @@
+@@ -22495,8 +22505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6264,7 +5560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22497,8 +22507,7 @@
+@@ -22586,8 +22595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6274,7 +5570,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22559,8 +22568,7 @@
+@@ -22648,8 +22656,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6284,7 +5580,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22628,8 +22636,7 @@
+@@ -22717,8 +22724,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6294,7 +5590,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22695,8 +22702,7 @@
+@@ -22784,8 +22790,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6304,7 +5600,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22789,8 +22795,7 @@
+@@ -22878,8 +22883,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6314,7 +5610,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22868,8 +22873,7 @@
+@@ -22957,8 +22961,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6324,7 +5620,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22953,8 +22957,7 @@
+@@ -23042,8 +23045,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6334,7 +5630,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23022,8 +23025,7 @@
+@@ -23111,8 +23113,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6344,7 +5640,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23118,8 +23120,7 @@
+@@ -23207,8 +23208,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6354,7 +5650,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23183,8 +23184,7 @@
+@@ -23272,8 +23272,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6364,7 +5660,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23279,8 +23279,7 @@
+@@ -23368,8 +23367,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6374,7 +5670,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23344,8 +23343,7 @@
+@@ -23433,8 +23431,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6384,7 +5680,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23441,8 +23439,7 @@
+@@ -23530,8 +23527,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6394,7 +5690,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23506,8 +23503,7 @@
+@@ -23595,8 +23591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6404,7 +5700,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23604,8 +23600,7 @@
+@@ -23693,8 +23688,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6414,7 +5710,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23670,8 +23665,7 @@
+@@ -23759,8 +23753,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6424,7 +5720,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23739,8 +23733,7 @@
+@@ -23828,8 +23821,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6434,7 +5730,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23891,8 +23884,7 @@
+@@ -23980,8 +23972,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6444,7 +5740,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24047,8 +24039,7 @@
+@@ -24136,8 +24127,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6454,7 +5750,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24113,8 +24104,7 @@
+@@ -24202,8 +24192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6464,7 +5760,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24261,8 +24251,7 @@
+@@ -24350,8 +24339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6474,7 +5770,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24417,8 +24406,7 @@
+@@ -24506,8 +24494,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6484,7 +5780,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24474,9 +24462,6 @@
+@@ -24563,9 +24550,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6494,7 +5790,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24510,8 +24495,7 @@
+@@ -24599,8 +24583,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6504,7 +5800,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24615,8 +24599,7 @@
+@@ -24704,8 +24687,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6514,7 +5810,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24716,8 +24699,7 @@
+@@ -24805,8 +24787,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6524,7 +5820,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24791,8 +24773,7 @@
+@@ -24880,8 +24861,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6534,7 +5830,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24855,8 +24836,7 @@
+@@ -24944,8 +24924,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6544,7 +5840,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24918,8 +24898,7 @@
+@@ -25007,8 +24986,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6554,7 +5850,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24959,8 +24938,7 @@
+@@ -25048,8 +25026,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6564,7 +5860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25016,8 +24994,7 @@
+@@ -25105,8 +25082,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6574,7 +5870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25057,8 +25034,7 @@
+@@ -25146,8 +25122,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6584,7 +5880,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25122,8 +25098,7 @@
+@@ -25211,8 +25186,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6594,7 +5890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25154,10 +25129,8 @@
+@@ -25243,10 +25217,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6607,7 +5903,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25268,8 +25241,7 @@
+@@ -25357,8 +25329,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6617,7 +5913,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25331,8 +25303,7 @@
+@@ -25420,8 +25391,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6627,7 +5923,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25372,8 +25343,7 @@
+@@ -25461,8 +25431,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6637,7 +5933,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25429,8 +25399,7 @@
+@@ -25518,8 +25487,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6647,7 +5943,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25470,8 +25439,7 @@
+@@ -25559,8 +25527,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6657,7 +5953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25535,8 +25503,7 @@
+@@ -25624,8 +25591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6667,7 +5963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25567,10 +25534,8 @@
+@@ -25656,10 +25622,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6680,7 +5976,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25681,8 +25646,7 @@
+@@ -25770,8 +25734,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6690,7 +5986,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25744,8 +25708,7 @@
+@@ -25833,8 +25796,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6700,7 +5996,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25785,8 +25748,7 @@
+@@ -25874,8 +25836,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6710,7 +6006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25842,8 +25804,7 @@
+@@ -25931,8 +25892,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6720,7 +6016,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25883,8 +25844,7 @@
+@@ -25972,8 +25932,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6730,7 +6026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25948,8 +25908,7 @@
+@@ -26037,8 +25996,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6740,7 +6036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25980,10 +25939,8 @@
+@@ -26069,10 +26027,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6753,7 +6049,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26094,8 +26051,7 @@
+@@ -26183,8 +26139,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6763,7 +6059,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26157,8 +26113,7 @@
+@@ -26246,8 +26201,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6773,7 +6069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26198,8 +26153,7 @@
+@@ -26287,8 +26241,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6783,7 +6079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26255,8 +26209,7 @@
+@@ -26344,8 +26297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6793,7 +6089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26296,8 +26249,7 @@
+@@ -26385,8 +26337,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6803,7 +6099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26361,8 +26313,7 @@
+@@ -26450,8 +26401,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6813,7 +6109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26393,10 +26344,8 @@
+@@ -26482,10 +26432,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6826,7 +6122,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26515,8 +26464,7 @@
+@@ -26604,8 +26552,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6836,7 +6132,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26587,8 +26535,7 @@
+@@ -26676,8 +26623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6846,7 +6142,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26658,8 +26605,7 @@
+@@ -26747,8 +26693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6856,7 +6152,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26721,8 +26667,7 @@
+@@ -26810,8 +26755,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6866,7 +6162,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26762,8 +26707,7 @@
+@@ -26851,8 +26795,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6876,7 +6172,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26819,8 +26763,7 @@
+@@ -26908,8 +26851,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6886,7 +6182,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26860,8 +26803,7 @@
+@@ -26949,8 +26891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6896,7 +6192,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26925,8 +26867,7 @@
+@@ -27014,8 +26955,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6906,7 +6202,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26957,10 +26898,8 @@
+@@ -27046,10 +26986,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6919,7 +6215,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27072,8 +27011,7 @@
+@@ -27161,8 +27099,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6929,7 +6225,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27135,8 +27073,7 @@
+@@ -27224,8 +27161,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6939,7 +6235,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27176,8 +27113,7 @@
+@@ -27265,8 +27201,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6949,7 +6245,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27233,8 +27169,7 @@
+@@ -27322,8 +27257,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6959,7 +6255,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27274,8 +27209,7 @@
+@@ -27363,8 +27297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6969,7 +6265,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27339,8 +27273,7 @@
+@@ -27428,8 +27361,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6979,7 +6275,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27371,10 +27304,8 @@
+@@ -27460,10 +27392,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6992,7 +6288,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27485,8 +27416,7 @@
+@@ -27574,8 +27504,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7002,7 +6298,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27556,8 +27486,7 @@
+@@ -27645,8 +27574,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7012,7 +6308,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27737,8 +27666,7 @@
+@@ -27826,8 +27754,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7022,7 +6318,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27847,8 +27775,7 @@
+@@ -27936,8 +27863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7032,7 +6328,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28072,8 +27999,7 @@
+@@ -28161,8 +28087,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7042,7 +6338,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28296,8 +28222,7 @@
+@@ -28385,8 +28310,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7052,7 +6348,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28373,8 +28298,7 @@
+@@ -28462,8 +28386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7062,7 +6358,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28516,8 +28440,7 @@
+@@ -28605,8 +28528,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7072,7 +6368,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28592,8 +28515,7 @@
+@@ -28681,8 +28603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7082,7 +6378,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28653,8 +28575,7 @@
+@@ -28742,8 +28663,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7092,7 +6388,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28737,8 +28658,7 @@
+@@ -28826,8 +28746,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7102,7 +6398,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28831,8 +28751,7 @@
+@@ -28920,8 +28839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7112,7 +6408,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29006,8 +28925,7 @@
+@@ -29095,8 +29013,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7122,7 +6418,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29105,8 +29023,7 @@
+@@ -29194,8 +29111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7132,7 +6428,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29199,8 +29116,7 @@
+@@ -29288,8 +29204,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7142,7 +6438,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29283,8 +29199,7 @@
+@@ -29372,8 +29287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7152,25 +6448,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29337,7 +29252,7 @@
+@@ -29426,7 +29340,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29340: $i/$j" >&5
-+ echo "configure: 29255: $i/$j" >&5
+- echo "configure: 29429: $i/$j" >&5
++ echo "configure: 29343: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29645,7 +29560,7 @@
+@@ -29734,7 +29648,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29648: $i/$j" >&5
-+ echo "configure: 29563: $i/$j" >&5
+- echo "configure: 29737: $i/$j" >&5
++ echo "configure: 29651: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30322,8 +30237,7 @@
+@@ -30411,8 +30325,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7180,43 +6476,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30482,7 +30396,7 @@
+@@ -30571,7 +30484,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30485: $i/$j" >&5
-+ echo "configure: 30399: $i/$j" >&5
+- echo "configure: 30574: $i/$j" >&5
++ echo "configure: 30487: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30512,7 +30426,7 @@
+@@ -30601,7 +30514,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30515: $i/$j" >&5
-+ echo "configure: 30429: $i/$j" >&5
+- echo "configure: 30604: $i/$j" >&5
++ echo "configure: 30517: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30530,7 +30444,7 @@
+@@ -30619,7 +30532,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30533: $i/$j" >&5
-+ echo "configure: 30447: $i/$j" >&5
+- echo "configure: 30622: $i/$j" >&5
++ echo "configure: 30535: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32032,7 +31946,7 @@
+@@ -32137,7 +32050,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32035: $i/$j" >&5
-+ echo "configure: 31949: $i/$j" >&5
+- echo "configure: 32140: $i/$j" >&5
++ echo "configure: 32053: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32229,8 +32143,7 @@
+@@ -32334,8 +32247,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7226,7 +6522,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32317,8 +32230,7 @@
+@@ -32422,8 +32334,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7236,7 +6532,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32405,8 +32317,7 @@
+@@ -32510,8 +32421,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7246,7 +6542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32493,8 +32404,7 @@
+@@ -32598,8 +32508,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7256,7 +6552,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32571,9 +32481,6 @@
+@@ -32692,8 +32601,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -32776,9 +32684,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7266,7 +6572,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32604,8 +32511,7 @@
+@@ -32809,8 +32714,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7276,7 +6582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32706,8 +32612,7 @@
+@@ -32911,8 +32815,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7286,7 +6592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32786,9 +32691,6 @@
+@@ -32991,9 +32894,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7296,7 +6602,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32819,8 +32721,7 @@
+@@ -33024,8 +32924,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7306,7 +6612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32921,8 +32822,7 @@
+@@ -33126,8 +33025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7316,7 +6622,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33030,8 +32930,7 @@
+@@ -33235,8 +33133,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7326,7 +6632,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33187,8 +33086,7 @@
+@@ -33392,8 +33289,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7336,7 +6642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33267,8 +33165,7 @@
+@@ -33472,8 +33368,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7346,7 +6652,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33349,8 +33246,7 @@
+@@ -33554,8 +33449,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7356,7 +6662,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33455,8 +33351,7 @@
+@@ -33660,8 +33554,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7366,7 +6672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33498,8 +33393,7 @@
+@@ -33703,8 +33596,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7376,7 +6682,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33556,8 +33450,7 @@
+@@ -33761,8 +33653,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7386,7 +6692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33986,8 +33879,7 @@
+@@ -34191,8 +34082,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7396,7 +6702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34881,6 +34773,13 @@
+@@ -35086,6 +34976,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -7410,7 +6716,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -35653,6 +35552,9 @@
+@@ -35858,6 +35755,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -7420,7 +6726,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -36037,11 +35939,6 @@
+@@ -36242,11 +36142,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -7432,7 +6738,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -36080,6 +35977,12 @@
+@@ -36285,6 +36180,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -7445,9 +6751,9 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nrua kdeaccessibility-3.4.0.orig/configure.in kdeaccessibility-3.4.0/configure.in
---- kdeaccessibility-3.4.0.orig/configure.in 2005-03-04 07:05:12.000000000 -0500
-+++ kdeaccessibility-3.4.0/configure.in 2005-03-04 23:43:26.000000000 -0500
+diff -rua kdeaccessibility-3.4.1.orig/configure.in kdeaccessibility-3.4.1/configure.in
+--- kdeaccessibility-3.4.1.orig/configure.in 2005-05-23 17:39:42.000000000 +0200
++++ kdeaccessibility-3.4.1/configure.in 2005-05-25 00:25:54.788392521 +0200
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdeaccessibility, 1.0.0) dnl searches for some needed programs
@@ -7457,22 +6763,10 @@
KDE_SET_PREFIX
dnl generate the config header
-diff -Nrua kdeaccessibility-3.4.0.orig/doc/Makefile.in kdeaccessibility-3.4.0/doc/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/doc/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -185,6 +185,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/doc/kmag/Makefile.in kdeaccessibility-3.4.1/doc/kmag/Makefile.in
+--- kdeaccessibility-3.4.1.orig/doc/kmag/Makefile.in 2005-05-23 17:40:29.000000000 +0200
++++ kdeaccessibility-3.4.1/doc/kmag/Makefile.in 2005-05-25 00:26:25.674611742 +0200
+@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7482,15 +6776,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -353,13 +356,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kmag kmousetool kmouth kttsd
-+SUBDIRS =. kmag kttsd kmousetool kmouth
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
+@@ -340,7 +343,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -7498,7 +6785,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -397,9 +400,9 @@
+@@ -378,9 +381,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7510,69 +6797,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -419,7 +422,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -431,7 +440,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -439,7 +448,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -460,7 +475,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/doc/kmag/Makefile.in kdeaccessibility-3.4.0/doc/kmag/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/kmag/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/doc/kmag/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/doc/kmousetool/Makefile.in kdeaccessibility-3.4.1/doc/kmousetool/Makefile.in
+--- kdeaccessibility-3.4.1.orig/doc/kmousetool/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/doc/kmousetool/Makefile.in 2005-05-25 00:26:25.681611111 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7604,58 +6831,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -525,10 +528,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=index.docbook screenshot.png Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -555,20 +558,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmag
-- @for base in index.docbook screenshot.png ; do \
-+ @for base in screenshot.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmag/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmag/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook screenshot.png ; do \
-+ for base in screenshot.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmag/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook screenshot.png ; do \
-+ for file in screenshot.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nrua kdeaccessibility-3.4.0.orig/doc/kmousetool/Makefile.in kdeaccessibility-3.4.0/doc/kmousetool/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/kmousetool/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/doc/kmousetool/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/doc/kmouth/Makefile.in kdeaccessibility-3.4.1/doc/kmouth/Makefile.in
+--- kdeaccessibility-3.4.1.orig/doc/kmouth/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/doc/kmouth/Makefile.in 2005-05-25 00:26:25.687610571 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7687,21 +6865,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/doc/kmouth/Makefile.in kdeaccessibility-3.4.0/doc/kmouth/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/kmouth/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/doc/kmouth/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/doc/kttsd/Makefile.in kdeaccessibility-3.4.1/doc/kttsd/Makefile.in
+--- kdeaccessibility-3.4.1.orig/doc/kttsd/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/doc/kttsd/Makefile.in 2005-05-25 00:26:25.694609941 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7733,59 +6899,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -525,10 +528,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kmouthmain.eps index.docbook kmouthedit.png Makefile.in kmouthcwcp.eps kmouthwizard.eps kmouthcpref.png kmouthcpref.eps kmouthmain.png kmouthedit.eps kmouthwizard.png kmouthctts.png Makefile.am kmouthcwcp.png kmouthctts.eps index.cache.bz2
-+KDE_DIST=Makefile.in kmouthcwcp.eps kmouthcpref.eps kmouthmain.png kmouthedit.eps kmouthctts.png kmouthcwcp.png kmouthctts.eps kmouthmain.eps index.docbook kmouthedit.png kmouthcpref.png kmouthwizard.eps kmouthwizard.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kmouthcpref.eps kmouthcpref.png kmouthctts.eps kmouthctts.png kmouthcwcp.eps kmouthcwcp.png kmouthedit.eps kmouthedit.png kmouthmain.eps kmouthmain.png kmouthwizard.eps kmouthwizard.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -555,20 +558,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth
-- @for base in index.docbook kmouthcpref.eps kmouthcpref.png kmouthctts.eps kmouthctts.png kmouthcwcp.eps kmouthcwcp.png kmouthedit.eps kmouthedit.png kmouthmain.eps kmouthmain.png kmouthwizard.eps kmouthwizard.png ; do \
-+ @for base in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook kmouthcpref.eps kmouthcpref.png kmouthctts.eps kmouthctts.png kmouthcwcp.eps kmouthcwcp.png kmouthedit.eps kmouthedit.png kmouthmain.eps kmouthmain.png kmouthwizard.eps kmouthwizard.png ; do \
-+ for base in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook kmouthcpref.eps kmouthcpref.png kmouthctts.eps kmouthctts.png kmouthcwcp.eps kmouthcwcp.png kmouthedit.eps kmouthedit.png kmouthmain.eps kmouthmain.png kmouthwizard.eps kmouthwizard.png ; do \
-+ for file in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nrua kdeaccessibility-3.4.0.orig/doc/kttsd/Makefile.in kdeaccessibility-3.4.0/doc/kttsd/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/kttsd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/doc/kttsd/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -169,6 +169,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/doc/Makefile.in kdeaccessibility-3.4.1/doc/Makefile.in
+--- kdeaccessibility-3.4.1.orig/doc/Makefile.in 2005-05-23 17:40:29.000000000 +0200
++++ kdeaccessibility-3.4.1/doc/Makefile.in 2005-05-25 00:26:25.668612282 +0200
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7795,8 +6912,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,7 +343,7 @@
- all: docs-am all-am
+@@ -359,7 +362,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -7804,7 +6921,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -378,9 +381,9 @@
+@@ -397,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7816,82 +6933,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -525,10 +528,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=audio.png talkers.png jobs.png index.docbook interruption.png Makefile.in talkerchooser.png festivalintconf.png addtalker.png general.png xmltransformer.png Makefile.am stringreplacer.png index.cache.bz2 filters.png
-+KDE_DIST=talkers.png Makefile.in filters.png audio.png index.docbook jobs.png interruption.png talkerchooser.png festivalintconf.png addtalker.png general.png xmltransformer.png Makefile.am stringreplacer.png index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) addtalker.png audio.png festivalintconf.png general.png index.docbook interruption.png jobs.png talkers.png filters.png stringreplacer.png talkerchooser.png xmltransformer.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.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
-@@ -555,20 +558,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd
-- @for base in addtalker.png audio.png festivalintconf.png general.png index.docbook interruption.png jobs.png talkers.png filters.png stringreplacer.png talkerchooser.png xmltransformer.png ; do \
-+ @for base in filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd/$$base ;\
- done
-
- uninstall-nls:
-- for base in addtalker.png audio.png festivalintconf.png general.png index.docbook interruption.png jobs.png talkers.png filters.png stringreplacer.png talkerchooser.png xmltransformer.png ; do \
-+ for base in filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in addtalker.png audio.png festivalintconf.png general.png index.docbook interruption.png jobs.png talkers.png filters.png stringreplacer.png talkerchooser.png xmltransformer.png ; do \
-+ for file in filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nrua kdeaccessibility-3.4.0.orig/kbstateapplet/Makefile.in kdeaccessibility-3.4.0/kbstateapplet/Makefile.in
---- kdeaccessibility-3.4.0.orig/kbstateapplet/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kbstateapplet/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kbstate_panelapplet_la_SOURCES)
- DIST_SOURCES = $(kbstate_panelapplet_la_SOURCES)
-@@ -232,6 +232,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/IconThemes/Makefile.in kdeaccessibility-3.4.1/IconThemes/Makefile.in
+--- kdeaccessibility-3.4.1.orig/IconThemes/Makefile.in 2005-05-23 17:40:29.000000000 +0200
++++ kdeaccessibility-3.4.1/IconThemes/Makefile.in 2005-05-25 00:26:25.652613722 +0200
+@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -7901,16 +6946,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -342,7 +345,7 @@
+ all: docs-am all-am
.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*) \
-@@ -453,9 +456,9 @@
+@@ -380,9 +383,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7920,80 +6965,11 @@
-$(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)
-@@ -570,7 +573,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -582,7 +591,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -590,7 +599,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -611,7 +626,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -870,7 +885,7 @@
- -rm -f kbstate.moc
-
- #>+ 2
--KDE_DIST=kbstateapplet.desktop Makefile.in eventsrc configure.in.in Makefile.am
-+KDE_DIST=Makefile.in kbstateapplet.desktop eventsrc configure.in.in Makefile.am
-
- #>+ 3
- clean-closures:
-diff -Nrua kdeaccessibility-3.4.0.orig/kbstateapplet/images/Makefile.in kdeaccessibility-3.4.0/kbstateapplet/images/Makefile.in
---- kdeaccessibility-3.4.0.orig/kbstateapplet/images/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kbstateapplet/images/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ mostlyclean-libtool:
+diff -rua kdeaccessibility-3.4.1.orig/kbstateapplet/images/Makefile.in kdeaccessibility-3.4.1/kbstateapplet/images/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kbstateapplet/images/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kbstateapplet/images/Makefile.in 2005-05-25 00:26:25.721607510 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8025,330 +7001,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -523,7 +526,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=cr22-action-keypressok.png cr22-action-shiftkey.png cr48-action-lockkey.png cr22-action-keypressno.png cr48-action-capskey.png cr32-action-keypressok.png cr22-action-superkey.png cr64-action-metakey.png cr16-action-keypressno.png cr16-action-superkey.png crsc-action-metakey.svg cr32-action-altkey.png crsc-action-altkey.svg cr32-action-lockkey.png cr22-action-capskey.png cr16-action-unlatched.png cr22-action-lockkey.png cr64-action-keypressno.png cr22-action-key.png cr48-action-shiftkey.png cr16-action-shiftkey.png cr16-action-hyperkey.png cr32-action-keypressno.png cr64-action-key.png cr16-action-lockkey.png crsc-action-keypressok.svg cr48-action-keypressok.png cr64-action-unlatched.png cr32-action-superkey.png crsc-action-controlkey.svg cr32-action-hyperkey.png cr22-action-altkey.png crsc-action-hyperkey.svg cr64-action-capskey.png cr16-action-capskey.png cr48-action-hyperkey.png cr64-action-hyperkey.png crsc-action-superkey.svg cr64-action-superkey.png crsc-action-keypressno.svg cr48-action-metakey.png cr16-action-controlkey.png cr22-action-hyperkey.png cr32-action-unlatched.png cr64-action-shiftkey.png cr64-action-lockkey.png cr32-action-capskey.png cr22-action-metakey.png cr48-action-key.png cr48-action-altkey.png cr48-action-keypressno.png cr16-action-metakey.png cr48-action-superkey.png cr16-action-altkey.png cr32-action-metakey.png cr22-action-controlkey.png cr16-action-key.png cr64-action-altkey.png cr22-action-unlatched.png cr48-action-controlkey.png crsc-action-unlatched.svg Makefile.in crsc-action-lockkey.svg cr32-action-key.png cr16-action-keypressok.png cr32-action-controlkey.png cr48-action-unlatched.png cr64-action-controlkey.png crsc-action-key.svg cr64-action-keypressok.png crsc-action-capskey.svg crsc-action-shiftkey.svg cr32-action-shiftkey.png Makefile.am
-+KDE_DIST=cr22-action-keypressok.png cr22-action-shiftkey.png cr48-action-lockkey.png cr22-action-keypressno.png cr48-action-capskey.png cr22-action-superkey.png cr32-action-keypressok.png cr64-action-metakey.png cr16-action-keypressno.png cr16-action-superkey.png crsc-action-metakey.svg cr32-action-altkey.png cr22-action-capskey.png crsc-action-altkey.svg cr32-action-lockkey.png cr16-action-unlatched.png cr64-action-keypressno.png cr22-action-lockkey.png cr22-action-key.png cr48-action-shiftkey.png cr16-action-shiftkey.png cr32-action-keypressno.png cr16-action-hyperkey.png cr64-action-key.png cr16-action-lockkey.png cr48-action-keypressok.png crsc-action-keypressok.svg cr64-action-unlatched.png cr32-action-superkey.png cr32-action-hyperkey.png crsc-action-controlkey.svg cr22-action-altkey.png crsc-action-hyperkey.svg cr16-action-capskey.png cr64-action-capskey.png cr48-action-hyperkey.png cr64-action-hyperkey.png crsc-action-superkey.svg cr64-action-superkey.png crsc-action-keypressno.svg cr48-action-metakey.png cr16-action-controlkey.png cr22-action-hyperkey.png cr32-action-unlatched.png cr64-action-shiftkey.png cr64-action-lockkey.png cr32-action-capskey.png cr22-action-metakey.png cr48-action-key.png cr48-action-altkey.png cr48-action-keypressno.png cr16-action-altkey.png cr48-action-superkey.png cr16-action-metakey.png cr32-action-metakey.png cr22-action-controlkey.png cr16-action-key.png cr48-action-controlkey.png cr64-action-altkey.png cr22-action-unlatched.png crsc-action-unlatched.svg crsc-action-lockkey.svg cr32-action-key.png Makefile.in cr16-action-keypressok.png cr32-action-controlkey.png cr48-action-unlatched.png crsc-action-key.svg cr64-action-controlkey.png cr64-action-keypressok.png crsc-action-capskey.svg crsc-action-shiftkey.svg cr32-action-shiftkey.png Makefile.am
-
- #>+ 2
- docs-am:
-@@ -531,157 +534,157 @@
- #>+ 154
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
-+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
-+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/capskey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/cr22-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
-- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/cr32-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
-+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-hyperkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-capskey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
-+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
-- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions
-- $(INSTALL_DATA) $(srcdir)/cr48-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-controlkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-shiftkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-keypressno.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
- $(INSTALL_DATA) $(srcdir)/cr48-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-keypressok.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-unlatched.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-altkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
- $(INSTALL_DATA) $(srcdir)/cr48-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-key.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
-- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions
-- $(INSTALL_DATA) $(srcdir)/cr64-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-superkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
- $(INSTALL_DATA) $(srcdir)/cr64-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-lockkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
- $(INSTALL_DATA) $(srcdir)/cr64-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
- $(INSTALL_DATA) $(srcdir)/cr64-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressok.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
-- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions
-- $(INSTALL_DATA) $(srcdir)/crsc-action-capskey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-controlkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-hyperkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-key.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-keypressno.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-keypressok.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-metakey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/metakey.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-shiftkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-superkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-unlatched.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
-- $(INSTALL_DATA) $(srcdir)/cr16-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
-- $(INSTALL_DATA) $(srcdir)/crsc-action-altkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-lockkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/capskey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressok.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/metakey.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
-- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
-+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmag/Makefile.in kdeaccessibility-3.4.0/kmag/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmag/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmag/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kmag_SOURCES)
- DIST_SOURCES = $(kmag_SOURCES)
-@@ -219,6 +219,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kbstateapplet/Makefile.in kdeaccessibility-3.4.1/kbstateapplet/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kbstateapplet/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kbstateapplet/Makefile.in 2005-05-25 00:26:25.706608861 +0200
+@@ -232,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8358,7 +7014,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -415,7 +418,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8367,7 +7023,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -453,9 +456,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8377,94 +7033,12 @@
-$(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)
-@@ -751,18 +754,18 @@
- .NOEXPORT:
-
- #>+ 3
--kmagselrect.moc: $(srcdir)/kmagselrect.h
-- $(MOC) $(srcdir)/kmagselrect.h -o kmagselrect.moc
-+kmag.moc: $(srcdir)/kmag.h
-+ $(MOC) $(srcdir)/kmag.h -o kmag.moc
-
- #>+ 2
--mocs: kmagselrect.moc
-+mocs: kmag.moc
-
- #>+ 3
--kmag.moc: $(srcdir)/kmag.h
-- $(MOC) $(srcdir)/kmag.h -o kmag.moc
-+kmagselrect.moc: $(srcdir)/kmagselrect.h
-+ $(MOC) $(srcdir)/kmagselrect.h -o kmagselrect.moc
-
- #>+ 2
--mocs: kmag.moc
-+mocs: kmagselrect.moc
-
- #>+ 3
- kmagzoomview.moc: $(srcdir)/kmagzoomview.h
-@@ -773,7 +776,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kmagselrect.moc kmag.moc kmagzoomview.moc
-+ -rm -f kmag.moc kmagselrect.moc kmagzoomview.moc
-
- #>+ 2
- KDE_DIST=hi16-action-hidemouse.png hi32-app-kmag.png kmag.mdk.spec kmag.lsm kmag.kdevprj hi16-action-followmouse.png Makefile.in hi16-action-window.png Makefile.am
-@@ -783,27 +786,27 @@
-
- #>+ 23
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-kmag.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmag.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/hi32-app-kmag.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmag.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/lo16-app-kmag.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kmag.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-kmag.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmag.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/lo32-app-kmag.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmag.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/hi32-app-kmag.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmag.png
- $(mkinstalldirs) $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-window.png $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/window.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-followmouse.png $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/followmouse.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-hidemouse.png $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/hidemouse.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-window.png $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/window.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmag.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmag.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kmag.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmag.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmag.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmag.png
-+ -rm -f $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/window.png
- -rm -f $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/followmouse.png
- -rm -f $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/hidemouse.png
-- -rm -f $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/window.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmousetool/Makefile.in kdeaccessibility-3.4.0/kmousetool/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmousetool/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmousetool/Makefile.in 2005-03-04 23:44:57.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -186,6 +186,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kmag/Makefile.in kdeaccessibility-3.4.1/kmag/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmag/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmag/Makefile.in 2005-05-25 00:26:25.736606160 +0200
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8474,16 +7048,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -356,7 +359,7 @@
- all: docs-am all-recursive
+@@ -407,7 +410,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*) \
-@@ -394,9 +397,9 @@
+@@ -445,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8493,94 +7067,11 @@
-$(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:
-@@ -416,7 +419,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -428,7 +437,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -436,7 +445,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -457,7 +472,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/Makefile.in kdeaccessibility-3.4.0/kmousetool/kmousetool/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmousetool/kmousetool/Makefile.in 2005-03-04 23:44:58.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kmousetool_SOURCES)
- DIST_SOURCES = $(kmousetool_SOURCES)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+diff -rua kdeaccessibility-3.4.1.orig/kmousetool/kmousetool/Makefile.in kdeaccessibility-3.4.1/kmousetool/kmousetool/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmousetool/kmousetool/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmousetool/kmousetool/Makefile.in 2005-05-25 00:26:25.755604449 +0200
@@ -236,6 +236,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8612,69 +7103,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -579,7 +582,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -591,7 +600,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -599,7 +608,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -620,7 +635,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/pics/Makefile.in kdeaccessibility-3.4.0/kmousetool/kmousetool/pics/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/pics/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmousetool/kmousetool/pics/Makefile.in 2005-03-04 23:44:58.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/kmousetool/kmousetool/pics/Makefile.in kdeaccessibility-3.4.1/kmousetool/kmousetool/pics/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmousetool/kmousetool/pics/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmousetool/kmousetool/pics/Makefile.in 2005-05-25 00:26:25.762603819 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8706,85 +7137,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -524,7 +527,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=hi16-action-kmousetool_on.png hi32-app-kmousetool.png hi16-app-kmousetool.png hi32-action-kmousetool_off.png Makefile.in hi32-action-kmousetool_on.png hi16-action-kmousetool_off.png Makefile.am
-+KDE_DIST=hi16-action-kmousetool_on.png hi32-app-kmousetool.png hi16-app-kmousetool.png hi32-action-kmousetool_off.png Makefile.in hi32-action-kmousetool_on.png Makefile.am hi16-action-kmousetool_off.png
-
- #>+ 2
- docs-am:
-@@ -533,14 +536,14 @@
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions
- $(INSTALL_DATA) $(srcdir)/hi16-action-kmousetool_off.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_off.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-kmousetool_on.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_on.png
- $(mkinstalldirs) $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kmousetool.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/apps/kmousetool.png
- $(mkinstalldirs) $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/hi32-action-kmousetool_off.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_off.png
- $(INSTALL_DATA) $(srcdir)/hi32-action-kmousetool_on.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_on.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-kmousetool_on.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_on.png
- $(mkinstalldirs) $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-kmousetool.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/apps/kmousetool.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-kmousetool_off.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_off.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kmousetool.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmousetool.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-@@ -548,11 +551,11 @@
-
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_off.png
-- -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_on.png
- -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/apps/kmousetool.png
-- -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_off.png
- -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_on.png
-+ -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_on.png
- -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/apps/kmousetool.png
-+ -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_off.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmousetool.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmousetool.png
-
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/Makefile.in kdeaccessibility-3.4.0/kmouth/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmouth/Makefile.in 2005-03-04 23:44:58.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kmouth_SOURCES)
- DIST_SOURCES = $(kmouth_SOURCES)
-@@ -245,6 +245,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kmousetool/Makefile.in kdeaccessibility-3.4.1/kmousetool/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmousetool/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmousetool/Makefile.in 2005-05-25 00:26:25.743605530 +0200
+@@ -186,6 +186,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8794,16 +7150,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -356,7 +359,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*) \
-@@ -471,9 +474,9 @@
+@@ -394,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8813,108 +7169,11 @@
-$(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)
-@@ -613,7 +616,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -625,7 +634,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -633,7 +642,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -654,7 +669,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -893,13 +908,6 @@
- mocs: speech.moc
-
- #>+ 3
--texttospeechsystem.moc: $(srcdir)/texttospeechsystem.h
-- $(MOC) $(srcdir)/texttospeechsystem.h -o texttospeechsystem.moc
--
--#>+ 2
--mocs: texttospeechsystem.moc
--
--#>+ 3
- phraselist.moc: $(srcdir)/phraselist.h
- $(MOC) $(srcdir)/phraselist.h -o phraselist.moc
-
-@@ -914,6 +922,13 @@
- mocs: optionsdialog.moc
-
- #>+ 3
-+texttospeechsystem.moc: $(srcdir)/texttospeechsystem.h
-+ $(MOC) $(srcdir)/texttospeechsystem.h -o texttospeechsystem.moc
-+
-+#>+ 2
-+mocs: texttospeechsystem.moc
-+
-+#>+ 3
- kmouth.moc: $(srcdir)/kmouth.h
- $(MOC) $(srcdir)/kmouth.h -o kmouth.moc
-
-@@ -929,7 +944,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f speech.moc texttospeechsystem.moc phraselist.moc optionsdialog.moc kmouth.moc configwizard.moc
-+ -rm -f speech.moc phraselist.moc optionsdialog.moc texttospeechsystem.moc kmouth.moc configwizard.moc
-
- #>+ 2
- KDE_DIST=kmouth.lsm Makefile.in Makefile.am
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/books/Makefile.in kdeaccessibility-3.4.0/kmouth/books/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/books/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmouth/books/Makefile.in 2005-03-04 23:44:58.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ mostlyclean-libtool:
+diff -rua kdeaccessibility-3.4.1.orig/kmouth/books/Makefile.in kdeaccessibility-3.4.1/kmouth/books/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmouth/books/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmouth/books/Makefile.in 2005-05-25 00:26:25.789601388 +0200
@@ -182,6 +182,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8946,22 +7205,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmouth/icons/Makefile.in 2005-03-04 23:44:58.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -187,6 +187,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kmouth/icons/app/Makefile.in kdeaccessibility-3.4.1/kmouth/icons/app/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmouth/icons/app/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmouth/icons/app/Makefile.in 2005-05-25 00:26:25.804600038 +0200
+@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8971,8 +7218,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -362,7 +365,7 @@
- all: docs-am all-recursive
+@@ -339,7 +342,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -8980,7 +7227,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -400,9 +403,9 @@
+@@ -377,9 +380,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8992,97 +7239,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -422,7 +425,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -434,7 +443,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -442,7 +451,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -463,7 +478,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -688,20 +703,20 @@
-
- #>+ 16
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/hi16-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/speak.png
- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
- $(INSTALL_DATA) $(srcdir)/hi22-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/speak.png
-- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/hi32-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/speak.png
-+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/speak.png
- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/48x48/actions
- $(INSTALL_DATA) $(srcdir)/hi48-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/48x48/actions/speak.png
-+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/speak.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/speak.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/speak.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/speak.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/speak.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/48x48/actions/speak.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/speak.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/app/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/app/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/app/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmouth/icons/app/Makefile.in 2005-03-04 23:44:58.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -169,6 +169,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kmouth/icons/history/Makefile.in kdeaccessibility-3.4.1/kmouth/icons/history/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmouth/icons/history/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmouth/icons/history/Makefile.in 2005-05-25 00:26:25.811599408 +0200
+@@ -171,6 +171,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9092,7 +7252,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -339,7 +342,7 @@
+@@ -345,7 +348,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -9101,7 +7261,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -377,9 +380,9 @@
+@@ -383,9 +386,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9113,64 +7273,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -529,29 +532,29 @@
-
- #>+ 25
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/lo22-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/22x22/apps/kmouth.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/hi32-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmouth.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/lo32-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmouth.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmouth.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- $(INSTALL_DATA) $(srcdir)/hi22-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmouth.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/hi32-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmouth.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/hi48-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmouth.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/lo16-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kmouth.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/lo22-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/22x22/apps/kmouth.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/lo32-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmouth.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/hi48-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmouth.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/22x22/apps/kmouth.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmouth.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmouth.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmouth.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmouth.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmouth.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmouth.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kmouth.png
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/22x22/apps/kmouth.png
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmouth.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmouth.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/history/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/history/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/history/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmouth/icons/history/Makefile.in 2005-03-04 23:44:58.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -171,6 +171,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kmouth/icons/Makefile.in kdeaccessibility-3.4.1/kmouth/icons/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmouth/icons/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmouth/icons/Makefile.in 2005-05-25 00:26:25.797600668 +0200
+@@ -187,6 +187,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9180,8 +7286,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -345,7 +348,7 @@
- all: docs-am all-am
+@@ -362,7 +365,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -9189,7 +7295,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -383,9 +386,9 @@
+@@ -400,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9201,62 +7307,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -535,29 +538,29 @@
-
- #>+ 25
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_print.png
- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_open.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_print.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_save.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_save.png
- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasehistory_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_open.png
- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_print.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_save.png
-- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_print.png
- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_open.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_print.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_save.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_save.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_save.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_print.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_open.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_print.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_save.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_save.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_open.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_print.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_save.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_print.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_open.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_print.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_save.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_save.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_save.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/phrase/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/phrase/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/phrase/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmouth/icons/phrase/Makefile.in 2005-03-04 23:44:58.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/kmouth/icons/phrase/Makefile.in kdeaccessibility-3.4.1/kmouth/icons/phrase/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmouth/icons/phrase/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmouth/icons/phrase/Makefile.in 2005-05-25 00:26:25.819598688 +0200
@@ -171,6 +171,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9288,73 +7341,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -535,35 +538,35 @@
-
- #>+ 31
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_save.png
- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_open.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-phrase.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_new.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_open.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_save.png
-- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/hi22-action-phrase.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_new.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_open.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_save.png
- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_save.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrase.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase.png
- $(INSTALL_DATA) $(srcdir)/hi32-action-phrase.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_new.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_open.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_save.png
- $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_open.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_save.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_new.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_new.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_save.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_open.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_new.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_open.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_save.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_save.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_new.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_open.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_save.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_new.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_open.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_save.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_open.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_save.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_new.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_new.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/phrasebook/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/phrasebook/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/phrasebook/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmouth/icons/phrasebook/Makefile.in 2005-03-04 23:44:58.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/kmouth/icons/phrasebook/Makefile.in kdeaccessibility-3.4.1/kmouth/icons/phrasebook/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmouth/icons/phrasebook/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmouth/icons/phrasebook/Makefile.in 2005-05-25 00:26:25.827597967 +0200
@@ -171,6 +171,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9386,106 +7375,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -535,41 +538,41 @@
+diff -rua kdeaccessibility-3.4.1.orig/kmouth/Makefile.in kdeaccessibility-3.4.1/kmouth/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmouth/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmouth/Makefile.in 2005-05-25 00:26:25.783601929 +0200
+@@ -245,6 +245,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@
+@@ -433,7 +436,7 @@
- #>+ 37
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_open.png
-+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_new.png
-+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_closed.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_save.png
- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_save.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_closed.png
- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_new.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_open.png
-- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_save.png
-- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_closed.png
- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_new.png
-- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_open.png
- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_save.png
-- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_closed.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_new.png
- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_open.png
-- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_save.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_closed.png
-+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_open.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook.png
+ .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*) \
+@@ -471,9 +474,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_open.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_new.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_closed.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_save.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_save.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_closed.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_new.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_open.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_save.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_closed.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_new.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_open.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_save.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_closed.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_new.png
- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_open.png
-- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_save.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_closed.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_open.png
-+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/phrasebook/Makefile.in kdeaccessibility-3.4.0/kmouth/phrasebook/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/phrasebook/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmouth/phrasebook/Makefile.in 2005-03-04 23:44:59.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libphrasebook_a_SOURCES)
- DIST_SOURCES = $(libphrasebook_a_SOURCES)
+-$(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)
+diff -rua kdeaccessibility-3.4.1.orig/kmouth/phrasebook/Makefile.in kdeaccessibility-3.4.1/kmouth/phrasebook/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmouth/phrasebook/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmouth/phrasebook/Makefile.in 2005-05-25 00:26:25.851595807 +0200
@@ -220,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9517,44 +7443,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/wordcompletion/Makefile.in kdeaccessibility-3.4.0/kmouth/wordcompletion/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/wordcompletion/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kmouth/wordcompletion/Makefile.in 2005-03-04 23:44:59.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libwordcompletion_a_SOURCES)
- DIST_SOURCES = $(libwordcompletion_a_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kmouth/wordcompletion/Makefile.in kdeaccessibility-3.4.1/kmouth/wordcompletion/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kmouth/wordcompletion/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kmouth/wordcompletion/Makefile.in 2005-05-25 00:26:25.868594276 +0200
@@ -212,6 +212,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9586,44 +7477,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-diff -Nrua kdeaccessibility-3.4.0.orig/ksayit/Freeverb_plugin/Makefile.in kdeaccessibility-3.4.0/ksayit/Freeverb_plugin/Makefile.in
---- kdeaccessibility-3.4.0.orig/ksayit/Freeverb_plugin/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/ksayit/Freeverb_plugin/Makefile.in 2005-03-04 23:45:00.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libFreeverb_plugin_la_SOURCES)
- DIST_SOURCES = $(libFreeverb_plugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/ksayit/Freeverb_plugin/Makefile.in kdeaccessibility-3.4.1/ksayit/Freeverb_plugin/Makefile.in
+--- kdeaccessibility-3.4.1.orig/ksayit/Freeverb_plugin/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/ksayit/Freeverb_plugin/Makefile.in 2005-05-25 00:26:25.879593286 +0200
@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9655,44 +7511,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-fxpluginsLTLIBRARIES: $(fxplugins_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/ksayit/KTTSD_Lib/Makefile.in kdeaccessibility-3.4.0/ksayit/KTTSD_Lib/Makefile.in
---- kdeaccessibility-3.4.0.orig/ksayit/KTTSD_Lib/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/ksayit/KTTSD_Lib/Makefile.in 2005-03-04 23:45:00.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libKTTSD_Lib_la_SOURCES)
- DIST_SOURCES = $(libKTTSD_Lib_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/ksayit/KTTSD_Lib/Makefile.in kdeaccessibility-3.4.1/ksayit/KTTSD_Lib/Makefile.in
+--- kdeaccessibility-3.4.1.orig/ksayit/KTTSD_Lib/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/ksayit/KTTSD_Lib/Makefile.in 2005-05-25 00:26:25.891592206 +0200
@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9724,60 +7545,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -739,22 +742,22 @@
- mocs: kttsdlibsetupimpl.moc
-
- #>+ 3
--kttsdlibtalker2.moc: $(srcdir)/kttsdlibtalker2.h
-- $(MOC) $(srcdir)/kttsdlibtalker2.h -o kttsdlibtalker2.moc
-+kttsdlib.moc: $(srcdir)/kttsdlib.h
-+ $(MOC) $(srcdir)/kttsdlib.h -o kttsdlib.moc
-
- #>+ 2
--mocs: kttsdlibtalker2.moc
-+mocs: kttsdlib.moc
-
- #>+ 3
--kttsdlib.moc: $(srcdir)/kttsdlib.h
-- $(MOC) $(srcdir)/kttsdlib.h -o kttsdlib.moc
-+kttsdlibtalker2.moc: $(srcdir)/kttsdlibtalker2.h
-+ $(MOC) $(srcdir)/kttsdlibtalker2.h -o kttsdlibtalker2.moc
-
- #>+ 2
--mocs: kttsdlib.moc
-+mocs: kttsdlibtalker2.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f kttsdlibsetupimpl.moc kttsdlibtalker2.moc kttsdlib.moc
-+ -rm -f kttsdlibsetupimpl.moc kttsdlib.moc kttsdlibtalker2.moc
-
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am KTTSDlibSetup.ui
-@@ -816,7 +819,7 @@
-
-
- #>+ 11
--libKTTSD_Lib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kttsdlib.cpp $(srcdir)/kttsdlibsetupimpl.cpp $(srcdir)/kttsdlibtalker2.cpp kspeech_stub.cpp kspeechsink_skel.cpp KTTSDlibSetup.cpp kttsdlibsetupimpl.moc kttsdlib.moc kttsdlibtalker2.moc KTTSDlibSetup.moc
-+libKTTSD_Lib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kttsdlib.cpp $(srcdir)/kttsdlibsetupimpl.cpp $(srcdir)/kttsdlibtalker2.cpp kspeech_stub.cpp kspeechsink_skel.cpp KTTSDlibSetup.cpp kttsdlibsetupimpl.moc kttsdlibtalker2.moc kttsdlib.moc KTTSDlibSetup.moc
- @echo 'creating libKTTSD_Lib_la.all_cpp.cpp ...'; \
- rm -f libKTTSD_Lib_la.all_cpp.files libKTTSD_Lib_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libKTTSD_Lib_la.all_cpp.final; \
-diff -Nrua kdeaccessibility-3.4.0.orig/ksayit/Makefile.in kdeaccessibility-3.4.0/ksayit/Makefile.in
---- kdeaccessibility-3.4.0.orig/ksayit/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/ksayit/Makefile.in 2005-03-04 23:45:00.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/ksayit/Makefile.in kdeaccessibility-3.4.1/ksayit/Makefile.in
+--- kdeaccessibility-3.4.1.orig/ksayit/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/ksayit/Makefile.in 2005-05-25 00:26:25.898591575 +0200
@@ -186,6 +186,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9809,92 +7579,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -417,7 +420,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -429,7 +438,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -437,7 +446,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -458,7 +473,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/ksayit/src/Makefile.in kdeaccessibility-3.4.0/ksayit/src/Makefile.in
---- kdeaccessibility-3.4.0.orig/ksayit/src/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/ksayit/src/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksayit_SOURCES)
- DIST_SOURCES = $(ksayit_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/ksayit/src/Makefile.in kdeaccessibility-3.4.1/ksayit/src/Makefile.in
+--- kdeaccessibility-3.4.1.orig/ksayit/src/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/ksayit/src/Makefile.in 2005-05-25 00:26:25.925589145 +0200
@@ -237,6 +237,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9926,124 +7613,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -810,18 +813,18 @@
- .NOEXPORT:
-
- #>+ 3
--ksayitsystemtray.moc: $(srcdir)/ksayitsystemtray.h
-- $(MOC) $(srcdir)/ksayitsystemtray.h -o ksayitsystemtray.moc
-+fxpluginhandler.moc: $(srcdir)/fxpluginhandler.h
-+ $(MOC) $(srcdir)/fxpluginhandler.h -o fxpluginhandler.moc
-
- #>+ 2
--mocs: ksayitsystemtray.moc
-+mocs: fxpluginhandler.moc
-
- #>+ 3
--fxpluginhandler.moc: $(srcdir)/fxpluginhandler.h
-- $(MOC) $(srcdir)/fxpluginhandler.h -o fxpluginhandler.moc
-+ksayitsystemtray.moc: $(srcdir)/ksayitsystemtray.h
-+ $(MOC) $(srcdir)/ksayitsystemtray.h -o ksayitsystemtray.moc
-
- #>+ 2
--mocs: fxpluginhandler.moc
-+mocs: ksayitsystemtray.moc
-
- #>+ 3
- voicesetupdlg.moc: $(srcdir)/voicesetupdlg.h
-@@ -831,18 +834,18 @@
- mocs: voicesetupdlg.moc
-
- #>+ 3
--ksayitviewimpl.moc: $(srcdir)/ksayitviewimpl.h
-- $(MOC) $(srcdir)/ksayitviewimpl.h -o ksayitviewimpl.moc
-+fxsetupimpl.moc: $(srcdir)/fxsetupimpl.h
-+ $(MOC) $(srcdir)/fxsetupimpl.h -o fxsetupimpl.moc
-
- #>+ 2
--mocs: ksayitviewimpl.moc
-+mocs: fxsetupimpl.moc
-
- #>+ 3
--fxsetupimpl.moc: $(srcdir)/fxsetupimpl.h
-- $(MOC) $(srcdir)/fxsetupimpl.h -o fxsetupimpl.moc
-+ksayitviewimpl.moc: $(srcdir)/ksayitviewimpl.h
-+ $(MOC) $(srcdir)/ksayitviewimpl.h -o ksayitviewimpl.moc
-
- #>+ 2
--mocs: fxsetupimpl.moc
-+mocs: ksayitviewimpl.moc
-
- #>+ 3
- ksayit.moc: $(srcdir)/ksayit.h
-@@ -853,7 +856,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f ksayitsystemtray.moc fxpluginhandler.moc voicesetupdlg.moc ksayitviewimpl.moc fxsetupimpl.moc ksayit.moc
-+ -rm -f fxpluginhandler.moc ksayitsystemtray.moc voicesetupdlg.moc fxsetupimpl.moc ksayitviewimpl.moc ksayit.moc
-
- #>+ 2
- KDE_DIST=ksayitui.rc hi32-app-ksayit_clipempty.png hi16-app-ksayit.png DocTreeView.ui fx_setup.ui hi32-app-ksayit_talking.png hi32-app-ksayit.png KSayItView.ui Makefile.in ksayit.desktop Makefile.am
-@@ -870,18 +873,18 @@
-
- #>+ 14
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/hi16-app-ksayit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksayit.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/hi32-app-ksayit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit.png
- $(INSTALL_DATA) $(srcdir)/hi32-app-ksayit_clipempty.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit_clipempty.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/hi16-app-ksayit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksayit.png
- $(INSTALL_DATA) $(srcdir)/hi32-app-ksayit_talking.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit_talking.png
-+ $(INSTALL_DATA) $(srcdir)/hi32-app-ksayit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksayit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit_clipempty.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksayit.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit_talking.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit.png
-
- #>+ 15
- force-reedit:
-@@ -922,7 +925,7 @@
-
-
- #>+ 11
--ksayit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/doctreeviewimpl.cpp $(srcdir)/effectstack.cpp $(srcdir)/fxpluginhandler.cpp $(srcdir)/fxsetupimpl.cpp $(srcdir)/ksayit_skel.cpp $(srcdir)/ksayit_stub.cpp $(srcdir)/ksayitsystemtray.cpp $(srcdir)/ksayitviewimpl.cpp $(srcdir)/main.cpp $(srcdir)/voicesetupdlg.cpp $(srcdir)/ksayit.cpp $(srcdir)/parasaxparser.cpp $(srcdir)/saxhandler.cpp $(srcdir)/ksayitbookmarkhandler.cpp DocTreeView.cpp fx_setup.cpp KSayItView.cpp voicesetupdlg.moc ksayit.moc fx_setup.moc ksayitsystemtray.moc fxpluginhandler.moc DocTreeView.moc ksayitviewimpl.moc fxsetupimpl.moc KSayItView.moc
-+ksayit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/doctreeviewimpl.cpp $(srcdir)/effectstack.cpp $(srcdir)/fxpluginhandler.cpp $(srcdir)/fxsetupimpl.cpp $(srcdir)/ksayit_skel.cpp $(srcdir)/ksayit_stub.cpp $(srcdir)/ksayitsystemtray.cpp $(srcdir)/ksayitviewimpl.cpp $(srcdir)/main.cpp $(srcdir)/voicesetupdlg.cpp $(srcdir)/ksayit.cpp $(srcdir)/parasaxparser.cpp $(srcdir)/saxhandler.cpp $(srcdir)/ksayitbookmarkhandler.cpp DocTreeView.cpp fx_setup.cpp KSayItView.cpp voicesetupdlg.moc ksayit.moc fx_setup.moc fxpluginhandler.moc ksayitsystemtray.moc DocTreeView.moc fxsetupimpl.moc ksayitviewimpl.moc KSayItView.moc
- @echo 'creating ksayit.all_cpp.cpp ...'; \
- rm -f ksayit.all_cpp.files ksayit.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> ksayit.all_cpp.final; \
-@@ -970,8 +973,8 @@
- $(srcdir)/parasaxparser.cpp: DocTreeView.h fx_setup.h KSayItView.h
- fxsetupimpl.lo: fxsetupimpl.moc
- $(srcdir)/saxhandler.cpp: DocTreeView.h fx_setup.h KSayItView.h
--ksayitsystemtray.o: ksayitsystemtray.moc
- ksayitviewimpl.o: ksayitviewimpl.moc
-+ksayitsystemtray.o: ksayitsystemtray.moc
- ksayitviewimpl.lo: ksayitviewimpl.moc
- $(srcdir)/ksayit_skel.cpp: DocTreeView.h fx_setup.h KSayItView.h
- $(srcdir)/ksayit.cpp: DocTreeView.h fx_setup.h KSayItView.h
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/Makefile.in kdeaccessibility-3.4.0/kttsd/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -186,6 +186,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/app-plugins/kate/Makefile.in kdeaccessibility-3.4.1/kttsd/app-plugins/kate/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/app-plugins/kate/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/app-plugins/kate/Makefile.in 2005-05-25 00:26:25.948587074 +0200
+@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10053,16 +7626,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -370,7 +373,7 @@
- all: docs-am all-recursive
+@@ -401,7 +404,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*) \
-@@ -408,9 +411,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10072,71 +7645,11 @@
-$(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:
-@@ -430,7 +433,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -442,7 +451,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -450,7 +459,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -471,7 +486,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/app-plugins/Makefile.in kdeaccessibility-3.4.0/kttsd/app-plugins/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/app-plugins/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/app-plugins/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/app-plugins/Makefile.in kdeaccessibility-3.4.1/kttsd/app-plugins/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/app-plugins/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/app-plugins/Makefile.in 2005-05-25 00:26:25.939587884 +0200
@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10168,93 +7681,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -415,7 +418,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -427,7 +436,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -435,7 +444,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -456,7 +471,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/app-plugins/kate/Makefile.in kdeaccessibility-3.4.0/kttsd/app-plugins/kate/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/app-plugins/kate/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/app-plugins/kate/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktexteditor_kttsd_la_SOURCES)
- DIST_SOURCES = $(ktexteditor_kttsd_la_SOURCES)
-@@ -214,6 +214,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/compat/interfaces/kspeech/Makefile.in kdeaccessibility-3.4.1/kttsd/compat/interfaces/kspeech/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/compat/interfaces/kspeech/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/compat/interfaces/kspeech/Makefile.in 2005-05-25 00:26:25.968585273 +0200
+@@ -186,6 +186,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10264,16 +7694,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -361,7 +364,7 @@
+ all: docs-am all-am
.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*) \
-@@ -439,9 +442,9 @@
+@@ -399,9 +402,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10283,23 +7713,11 @@
-$(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)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/compat/Makefile.in kdeaccessibility-3.4.0/kttsd/compat/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/compat/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/compat/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ mostlyclean-libtool:
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/compat/interfaces/Makefile.in kdeaccessibility-3.4.1/kttsd/compat/interfaces/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/compat/interfaces/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/compat/interfaces/Makefile.in 2005-05-25 00:26:25.961585904 +0200
@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10331,69 +7749,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -417,7 +420,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -429,7 +438,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -437,7 +446,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -458,7 +473,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/Makefile.in kdeaccessibility-3.4.0/kttsd/compat/interfaces/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/compat/interfaces/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/compat/Makefile.in kdeaccessibility-3.4.1/kttsd/compat/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/compat/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/compat/Makefile.in 2005-05-25 00:26:25.955586444 +0200
@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10425,138 +7783,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -417,7 +420,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -429,7 +438,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -437,7 +446,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -458,7 +473,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/kspeech/Makefile.in kdeaccessibility-3.4.0/kttsd/compat/interfaces/kspeech/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/kspeech/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/compat/interfaces/kspeech/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -186,6 +186,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@
-@@ -361,7 +364,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*) \
-@@ -399,9 +402,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:
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/filters/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,18 +66,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(testfilter_SOURCES)
- DIST_SOURCES = $(testfilter_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/filters/Makefile.in kdeaccessibility-3.4.1/kttsd/filters/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/filters/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/filters/Makefile.in 2005-05-25 00:26:25.976584553 +0200
@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10588,92 +7817,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -529,7 +532,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -541,7 +550,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -549,7 +558,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -570,7 +585,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/sbd/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/sbd/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/sbd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/filters/sbd/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_sbdplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_sbdplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/filters/sbd/Makefile.in kdeaccessibility-3.4.1/kttsd/filters/sbd/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/filters/sbd/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/filters/sbd/Makefile.in 2005-05-25 00:26:25.993583023 +0200
@@ -221,6 +221,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10705,44 +7851,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/stringreplacer/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/stringreplacer/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/stringreplacer/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/filters/stringreplacer/Makefile.in 2005-03-04 23:45:02.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_stringreplacerplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_stringreplacerplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/filters/stringreplacer/Makefile.in kdeaccessibility-3.4.1/kttsd/filters/stringreplacer/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/filters/stringreplacer/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/filters/stringreplacer/Makefile.in 2005-05-25 00:26:26.005581942 +0200
@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10774,44 +7885,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/talkerchooser/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/talkerchooser/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/talkerchooser/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/filters/talkerchooser/Makefile.in 2005-03-04 23:45:03.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_talkerchooserplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_talkerchooserplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/filters/talkerchooser/Makefile.in kdeaccessibility-3.4.1/kttsd/filters/talkerchooser/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/filters/talkerchooser/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/filters/talkerchooser/Makefile.in 2005-05-25 00:26:26.019580682 +0200
@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10843,44 +7919,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/xmltransformer/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/xmltransformer/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/xmltransformer/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/filters/xmltransformer/Makefile.in 2005-03-04 23:45:03.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_xmltransformerplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_xmltransformerplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/filters/xmltransformer/Makefile.in kdeaccessibility-3.4.1/kttsd/filters/xmltransformer/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/filters/xmltransformer/Makefile.in 2005-05-23 17:40:31.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/filters/xmltransformer/Makefile.in 2005-05-25 00:26:26.041578701 +0200
@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10912,21 +7953,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/icons/Makefile.in kdeaccessibility-3.4.0/kttsd/icons/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/icons/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/icons/Makefile.in 2005-03-04 23:45:03.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/icons/Makefile.in kdeaccessibility-3.4.1/kttsd/icons/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/icons/Makefile.in 2005-05-23 17:40:31.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/icons/Makefile.in 2005-05-25 00:26:26.054577531 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10958,113 +7987,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -531,50 +534,50 @@
-
- #>+ 46
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/16x16/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/64x64/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
-+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/16x16/apps/kttsd.png
- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/64x64/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
-
- #>+ 15
- force-reedit:
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/kcmkttsmgr/Makefile.in kdeaccessibility-3.4.0/kttsd/kcmkttsmgr/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/kcmkttsmgr/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/kcmkttsmgr/Makefile.in 2005-03-04 23:45:03.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kttsd_la_SOURCES)
- DIST_SOURCES = $(kcm_kttsd_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/kcmkttsmgr/Makefile.in kdeaccessibility-3.4.1/kttsd/kcmkttsmgr/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/kcmkttsmgr/Makefile.in 2005-05-23 17:40:31.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/kcmkttsmgr/Makefile.in 2005-05-25 00:26:26.078575370 +0200
@@ -223,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11096,21 +8021,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/kttsd/Makefile.in kdeaccessibility-3.4.0/kttsd/kttsd/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/kttsd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/kttsd/Makefile.in 2005-03-04 23:45:04.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/kttsd/Makefile.in kdeaccessibility-3.4.1/kttsd/kttsd/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/kttsd/Makefile.in 2005-05-23 17:40:31.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/kttsd/Makefile.in 2005-05-25 00:26:26.116571949 +0200
@@ -72,7 +72,7 @@
am__DEPENDENCIES_1 =
kttsd_DEPENDENCIES = $(top_builddir)/kttsd/libkttsd/libkttsd.la \
@@ -11120,29 +8033,6 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kttsd_SOURCES)
- DIST_SOURCES = $(kttsd_SOURCES)
@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11195,21 +8085,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/kttsjobmgr/Makefile.in kdeaccessibility-3.4.0/kttsd/kttsjobmgr/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/kttsjobmgr/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/kttsjobmgr/Makefile.in 2005-03-04 23:45:04.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/kttsjobmgr/Makefile.in kdeaccessibility-3.4.1/kttsd/kttsjobmgr/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/kttsjobmgr/Makefile.in 2005-05-23 17:40:31.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/kttsjobmgr/Makefile.in 2005-05-25 00:26:26.128570869 +0200
@@ -43,8 +43,8 @@
host_triplet = @host@
target_triplet = @target@
@@ -11231,29 +8109,7 @@
kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(kde_module_LTLIBRARIES)
am__DEPENDENCIES_1 =
-@@ -83,26 +82,25 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsjobmgrpart_la_SOURCES)
- DIST_SOURCES = $(libkttsjobmgrpart_la_SOURCES)
+@@ -101,8 +100,7 @@
kde_servicesDATA_INSTALL = $(INSTALL_DATA)
rcDATA_INSTALL = $(INSTALL_DATA)
DATA = $(kde_services_DATA) $(rc_DATA)
@@ -11402,44 +8258,9 @@
if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/kttsmgr/Makefile.in kdeaccessibility-3.4.0/kttsd/kttsmgr/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/kttsmgr/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/kttsmgr/Makefile.in 2005-03-04 23:45:04.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kttsmgr_SOURCES)
- DIST_SOURCES = $(kttsmgr_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/kttsmgr/Makefile.in kdeaccessibility-3.4.1/kttsd/kttsmgr/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/kttsmgr/Makefile.in 2005-05-23 17:40:31.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/kttsmgr/Makefile.in 2005-05-25 00:26:26.137570059 +0200
@@ -220,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11471,44 +8292,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/libkttsd/Makefile.in kdeaccessibility-3.4.0/kttsd/libkttsd/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/libkttsd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/libkttsd/Makefile.in 2005-03-04 23:45:05.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_la_SOURCES)
- DIST_SOURCES = $(libkttsd_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/libkttsd/Makefile.in kdeaccessibility-3.4.1/kttsd/libkttsd/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/libkttsd/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/libkttsd/Makefile.in 2005-05-25 00:26:26.151568798 +0200
@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11540,90 +8326,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -770,18 +773,18 @@
-
-
- #>+ 3
--pluginproc.moc: $(srcdir)/pluginproc.h
-- $(MOC) $(srcdir)/pluginproc.h -o pluginproc.moc
-+filterproc.moc: $(srcdir)/filterproc.h
-+ $(MOC) $(srcdir)/filterproc.h -o filterproc.moc
-
- #>+ 2
--mocs: pluginproc.moc
-+mocs: filterproc.moc
-
- #>+ 3
--filterproc.moc: $(srcdir)/filterproc.h
-- $(MOC) $(srcdir)/filterproc.h -o filterproc.moc
-+pluginproc.moc: $(srcdir)/pluginproc.h
-+ $(MOC) $(srcdir)/pluginproc.h -o pluginproc.moc
-
- #>+ 2
--mocs: filterproc.moc
-+mocs: pluginproc.moc
-
- #>+ 3
- stretcher.moc: $(srcdir)/stretcher.h
-@@ -791,18 +794,18 @@
- mocs: stretcher.moc
-
- #>+ 3
--player.moc.cpp: $(srcdir)/player.h
-- $(MOC) $(srcdir)/player.h -o player.moc.cpp
-+filterconf.moc: $(srcdir)/filterconf.h
-+ $(MOC) $(srcdir)/filterconf.h -o filterconf.moc
-
- #>+ 2
--mocs: player.moc.cpp
-+mocs: filterconf.moc
-
- #>+ 3
--filterconf.moc: $(srcdir)/filterconf.h
-- $(MOC) $(srcdir)/filterconf.h -o filterconf.moc
-+player.moc.cpp: $(srcdir)/player.h
-+ $(MOC) $(srcdir)/player.h -o player.moc.cpp
-
- #>+ 2
--mocs: filterconf.moc
-+mocs: player.moc.cpp
-
- #>+ 3
- pluginconf.moc: $(srcdir)/pluginconf.h
-@@ -813,7 +816,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f pluginproc.moc filterproc.moc stretcher.moc player.moc.cpp filterconf.moc pluginconf.moc
-+ -rm -f filterproc.moc pluginproc.moc stretcher.moc filterconf.moc player.moc.cpp pluginconf.moc
-
- #>+ 2
- KDE_DIST=kttsd_synthplugin.desktop filterproc.h Makefile.in filterconf.h Makefile.am
-@@ -864,7 +867,7 @@
-
-
- #>+ 11
--libkttsd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginproc.cpp $(srcdir)/pluginconf.cpp $(srcdir)/testplayer.cpp $(srcdir)/stretcher.cpp $(srcdir)/talkercode.cpp $(srcdir)/filterproc.cpp $(srcdir)/filterconf.cpp $(srcdir)/utils.cpp player.moc.cpp filterproc.moc pluginproc.moc filterconf.moc stretcher.moc pluginconf.moc
-+libkttsd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginproc.cpp $(srcdir)/pluginconf.cpp $(srcdir)/testplayer.cpp $(srcdir)/stretcher.cpp $(srcdir)/talkercode.cpp $(srcdir)/filterproc.cpp $(srcdir)/filterconf.cpp $(srcdir)/utils.cpp player.moc.cpp pluginproc.moc filterproc.moc filterconf.moc stretcher.moc pluginconf.moc
- @echo 'creating libkttsd_la.all_cpp.cpp ...'; \
- rm -f libkttsd_la.all_cpp.files libkttsd_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkttsd_la.all_cpp.final; \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/players/Makefile.in kdeaccessibility-3.4.0/kttsd/players/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/players/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/players/Makefile.in 2005-03-04 23:45:05.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -195,6 +195,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/Makefile.in kdeaccessibility-3.4.1/kttsd/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/Makefile.in 2005-05-23 17:40:30.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/Makefile.in 2005-05-25 00:26:25.932588514 +0200
+@@ -186,6 +186,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11633,7 +8339,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -372,7 +375,7 @@
+@@ -370,7 +373,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11642,7 +8348,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -410,9 +413,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11654,92 +8360,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -449,7 +452,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -461,7 +470,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -469,7 +478,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -490,7 +505,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/players/artsplayer/Makefile.in kdeaccessibility-3.4.0/kttsd/players/artsplayer/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/players/artsplayer/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/players/artsplayer/Makefile.in 2005-03-04 23:45:05.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_artsplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_artsplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/players/artsplayer/Makefile.in kdeaccessibility-3.4.1/kttsd/players/artsplayer/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/players/artsplayer/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/players/artsplayer/Makefile.in 2005-05-25 00:26:26.169567178 +0200
@@ -220,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11771,44 +8394,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/players/gstplayer/Makefile.in kdeaccessibility-3.4.0/kttsd/players/gstplayer/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/players/gstplayer/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/players/gstplayer/Makefile.in 2005-03-04 23:45:05.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_gstplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_gstplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/players/gstplayer/Makefile.in kdeaccessibility-3.4.1/kttsd/players/gstplayer/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/players/gstplayer/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/players/gstplayer/Makefile.in 2005-05-25 00:26:26.180566188 +0200
@@ -222,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11840,22 +8428,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/plugins/Makefile.in 2005-03-04 23:45:05.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -185,6 +185,9 @@
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/players/Makefile.in kdeaccessibility-3.4.1/kttsd/players/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/players/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/players/Makefile.in 2005-05-25 00:26:26.158568168 +0200
+@@ -195,6 +195,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11865,7 +8441,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -380,7 +383,7 @@
+@@ -372,7 +375,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -11874,7 +8450,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -418,9 +421,9 @@
+@@ -410,9 +413,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11886,92 +8462,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -440,7 +443,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -452,7 +461,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -460,7 +469,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -481,7 +496,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/command/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/command/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/command/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/plugins/command/Makefile.in 2005-03-04 23:45:05.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_commandplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_commandplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/plugins/command/Makefile.in kdeaccessibility-3.4.1/kttsd/plugins/command/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/plugins/command/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/plugins/command/Makefile.in 2005-05-25 00:26:26.199564477 +0200
@@ -220,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12003,44 +8496,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/epos/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/epos/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/epos/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/plugins/epos/Makefile.in 2005-03-04 23:45:06.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_eposplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_eposplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/plugins/epos/Makefile.in kdeaccessibility-3.4.1/kttsd/plugins/epos/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/plugins/epos/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/plugins/epos/Makefile.in 2005-05-25 00:26:26.211563397 +0200
@@ -222,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12072,44 +8530,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/festivalint/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/festivalint/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/festivalint/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/plugins/festivalint/Makefile.in 2005-03-04 23:45:06.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_festivalintplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_festivalintplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/plugins/festivalint/Makefile.in kdeaccessibility-3.4.1/kttsd/plugins/festivalint/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/plugins/festivalint/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/plugins/festivalint/Makefile.in 2005-05-25 00:26:26.224562226 +0200
@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12141,44 +8564,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/flite/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/flite/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/flite/Makefile.in 2005-03-04 07:05:50.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/plugins/flite/Makefile.in 2005-03-04 23:45:07.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_fliteplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_fliteplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/plugins/flite/Makefile.in kdeaccessibility-3.4.1/kttsd/plugins/flite/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/plugins/flite/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/plugins/flite/Makefile.in 2005-05-25 00:26:26.237561056 +0200
@@ -223,6 +223,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12210,44 +8598,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/freetts/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/freetts/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/freetts/Makefile.in 2005-03-04 07:05:51.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/plugins/freetts/Makefile.in 2005-03-04 23:45:07.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_freettsplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_freettsplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/plugins/freetts/Makefile.in kdeaccessibility-3.4.1/kttsd/plugins/freetts/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/plugins/freetts/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/plugins/freetts/Makefile.in 2005-05-25 00:26:26.250559886 +0200
@@ -220,6 +220,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12279,44 +8632,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/hadifix/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/hadifix/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/hadifix/Makefile.in 2005-03-04 07:05:51.000000000 -0500
-+++ kdeaccessibility-3.4.0/kttsd/plugins/hadifix/Makefile.in 2005-03-04 23:45:07.000000000 -0500
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkttsd_hadifixplugin_la_SOURCES)
- DIST_SOURCES = $(libkttsd_hadifixplugin_la_SOURCES)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/plugins/hadifix/Makefile.in kdeaccessibility-3.4.1/kttsd/plugins/hadifix/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/plugins/hadifix/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/plugins/hadifix/Makefile.in 2005-05-25 00:26:26.262558805 +0200
@@ -224,6 +224,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -12348,3 +8666,92 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+diff -rua kdeaccessibility-3.4.1.orig/kttsd/plugins/Makefile.in kdeaccessibility-3.4.1/kttsd/plugins/Makefile.in
+--- kdeaccessibility-3.4.1.orig/kttsd/plugins/Makefile.in 2005-05-23 17:40:32.000000000 +0200
++++ kdeaccessibility-3.4.1/kttsd/plugins/Makefile.in 2005-05-25 00:26:26.186565647 +0200
+@@ -185,6 +185,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@
+@@ -380,7 +383,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*) \
+@@ -418,9 +421,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:
+diff -rua kdeaccessibility-3.4.1.orig/Makefile.in kdeaccessibility-3.4.1/Makefile.in
+--- kdeaccessibility-3.4.1.orig/Makefile.in 2005-05-23 17:40:29.000000000 +0200
++++ kdeaccessibility-3.4.1/Makefile.in 2005-05-25 00:26:25.661612912 +0200
+@@ -202,6 +202,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@
+@@ -378,7 +381,7 @@
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -420,12 +423,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
+@@ -437,7 +440,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 $@
+@@ -853,7 +856,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=configure.in subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in kdeaccessibility.lsm acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in configure.in subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in configure kdeaccessibility.lsm acinclude.m4 Makefile.am Makefile.am.in
+
+ #>+ 2
+ docs-am: