[Pkg-kde-commits] rev 1129 - in branches/kde-3.4.0/packages/kdetoys/debian: . patches
Pierre Habouzit
madcoder-guest@costa.debian.org
Wed, 25 May 2005 06:41:53 +0000
Author: madcoder-guest
Date: 2005-05-25 06:41:51 +0000 (Wed, 25 May 2005)
New Revision: 1129
Modified:
branches/kde-3.4.0/packages/kdetoys/debian/changelog
branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff
Log:
kdetoys 3.4.1 : buildprep
Modified: branches/kde-3.4.0/packages/kdetoys/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/changelog 2005-05-25 06:30:44 UTC (rev 1128)
+++ branches/kde-3.4.0/packages/kdetoys/debian/changelog 2005-05-25 06:41:51 UTC (rev 1129)
@@ -1,3 +1,9 @@
+kdetoys (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 08:40:22 +0200
+
kdetoys (4:3.4.0-0pre1) alioth; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff 2005-05-25 06:30:44 UTC (rev 1128)
+++ branches/kde-3.4.0/packages/kdetoys/debian/patches/98_buildprep.diff 2005-05-25 06:41:51 UTC (rev 1129)
@@ -1,122 +1,7 @@
-diff -Nrua kdetoys-3.4.0.orig/Makefile.in kdetoys-3.4.0/Makefile.in
---- kdetoys-3.4.0.orig/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/Makefile.in 2005-03-05 17:49:12.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.
-@@ -192,6 +192,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@
-@@ -350,7 +353,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*) \
-@@ -392,12 +395,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
-@@ -409,7 +412,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 $@
-@@ -434,7 +437,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 \
-@@ -446,7 +455,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; \
-@@ -454,7 +463,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)' ;; \
-@@ -475,7 +490,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 \
-@@ -814,7 +829,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/acinclude.m4 kdetoys-3.4.0/acinclude.m4
---- kdetoys-3.4.0.orig/acinclude.m4 2005-03-04 07:40:46.000000000 -0500
-+++ kdetoys-3.4.0/acinclude.m4 2005-03-05 17:48:11.000000000 -0500
-@@ -1682,15 +1682,6 @@
+diff -rua kdetoys-3.4.1.orig/acinclude.m4 kdetoys-3.4.1/acinclude.m4
+--- kdetoys-3.4.1.orig/acinclude.m4 2005-05-23 18:12:12.000000000 +0200
++++ kdetoys-3.4.1/acinclude.m4 2005-05-25 08:40:10.772163130 +0200
+@@ -1690,15 +1690,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -132,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"
@@ -142,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
@@ -150,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.
@@ -159,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*)
@@ -173,7 +58,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6260,7 +6248,6 @@
esac
;;
*64-bit*)
@@ -181,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
@@ -190,7 +75,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6419,20 +6406,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -222,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
])
;;
@@ -231,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
@@ -245,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 .
@@ -259,7 +144,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6819,7 +6808,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -268,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=
@@ -277,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"
@@ -299,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.
@@ -308,7 +193,7 @@
;;
beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6932,7 +6934,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -317,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
@@ -326,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
;;
@@ -335,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*)
@@ -344,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*)
@@ -353,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
;;
*)
@@ -362,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'
@@ -391,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'
;;
@@ -422,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
@@ -431,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
@@ -440,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'
@@ -449,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*)
@@ -490,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*)
@@ -540,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*)
@@ -550,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
@@ -558,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])
@@ -567,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
;;
@@ -576,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]])
@@ -620,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
@@ -631,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
@@ -642,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.
@@ -651,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
@@ -676,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
@@ -697,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"
@@ -713,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.
@@ -722,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'
@@ -737,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~
@@ -746,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]])
@@ -777,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
@@ -803,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
;;
@@ -812,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)
@@ -821,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.
@@ -835,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'
;;
*)
@@ -844,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'
;;
*)
@@ -853,7 +738,7 @@
;;
esac
fi
-@@ -8744,7 +8748,7 @@
+@@ -8828,7 +8832,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -862,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
@@ -874,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.
@@ -885,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
@@ -906,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
;;
@@ -915,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.
@@ -924,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}\*'
@@ -933,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}\*'
@@ -942,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.
@@ -951,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 \*'
@@ -964,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}\*'
@@ -973,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'
@@ -985,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
@@ -994,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
@@ -1006,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.
@@ -1018,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
;;
@@ -1027,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
;;
@@ -1036,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
@@ -1051,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) | \
@@ -1060,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
@@ -1069,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").
@@ -1078,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.
@@ -1090,7 +975,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10037,7 @@
+@@ -10113,7 +10121,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1099,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'*)
@@ -1108,7 +993,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10346,7 +10354,7 @@
;;
esac
;;
@@ -1117,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'
@@ -1126,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
;;
@@ -1135,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'
;;
@@ -1145,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)=
@@ -1154,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
@@ -1163,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'
@@ -1179,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~
@@ -1203,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
@@ -1214,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
;;
@@ -1253,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
@@ -1276,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
@@ -1315,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.
@@ -1324,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)=' '
@@ -1341,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]])
@@ -1376,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
@@ -1411,7 +1296,7 @@
;;
dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11156,8 +11204,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1422,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
@@ -1431,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*)
@@ -1444,7 +1329,7 @@
;;
esac
else
-@@ -11149,7 +11197,7 @@
+@@ -11233,7 +11281,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1453,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
;;
@@ -1462,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
@@ -1471,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'
;;
*)
@@ -1480,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
@@ -1497,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}\*'
@@ -1506,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
@@ -1518,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.
@@ -1527,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
@@ -1539,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
@@ -1548,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
@@ -1558,361 +1443,25 @@
AC_MSG_RESULT([$SED])
])
-diff -Nrua kdetoys-3.4.0.orig/aclocal.m4 kdetoys-3.4.0/aclocal.m4
---- kdetoys-3.4.0.orig/aclocal.m4 2005-03-04 07:40:55.000000000 -0500
-+++ kdetoys-3.4.0/aclocal.m4 2005-03-05 17:48:28.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 kdetoys-3.4.1.orig/aclocal.m4 kdetoys-3.4.1/aclocal.m4
+--- kdetoys-3.4.1.orig/aclocal.m4 2005-05-23 18:12:22.000000000 +0200
++++ kdetoys-3.4.1/aclocal.m4 2005-05-25 08:40:25.225850608 +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
@@ -1927,268 +1476,16 @@
+ 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 kdetoys-3.4.0.orig/amor/Makefile.in kdetoys-3.4.0/amor/Makefile.in
---- kdetoys-3.4.0.orig/amor/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/Makefile.in 2005-03-05 17:49:12.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 = $(amor_SOURCES)
- DIST_SOURCES = $(amor_SOURCES)
-@@ -232,6 +232,9 @@
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+diff -rua kdetoys-3.4.1.orig/amor/data/Makefile.in kdetoys-3.4.1/amor/data/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/Makefile.in 2005-05-25 08:40:54.716172799 +0200
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2198,16 +1495,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -343,7 +346,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*) \
-@@ -451,9 +454,9 @@
+@@ -381,9 +384,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2217,145 +1514,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)
- @$(NORMAL_INSTALL)
-@@ -575,7 +578,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 \
-@@ -587,7 +596,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; \
-@@ -595,7 +604,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)' ;; \
-@@ -616,7 +631,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 \
-@@ -857,18 +872,18 @@
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub AmorIface.kidl
-
- #>+ 3
--amorwidget.moc: $(srcdir)/amorwidget.h
-- $(MOC) $(srcdir)/amorwidget.h -o amorwidget.moc
-+amor.moc: $(srcdir)/amor.h
-+ $(MOC) $(srcdir)/amor.h -o amor.moc
-
- #>+ 2
--mocs: amorwidget.moc
-+mocs: amor.moc
-
- #>+ 3
--amor.moc: $(srcdir)/amor.h
-- $(MOC) $(srcdir)/amor.h -o amor.moc
-+amorwidget.moc: $(srcdir)/amorwidget.h
-+ $(MOC) $(srcdir)/amorwidget.h -o amorwidget.moc
-
- #>+ 2
--mocs: amor.moc
-+mocs: amorwidget.moc
-
- #>+ 3
- amordialog.moc: $(srcdir)/amordialog.h
-@@ -886,7 +901,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f amorwidget.moc amor.moc amordialog.moc amorbubble.moc
-+ -rm -f amor.moc amorwidget.moc amordialog.moc amorbubble.moc
-
- #>+ 2
- KDE_DIST=cr48-app-amor.png Makefile.in preparetips cr32-app-amor.png amor.desktop version.h cr16-app-amor.png configure.in.in Makefile.am
-@@ -901,17 +916,17 @@
-
- #>+ 13
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-amor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/amor.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-amor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/amor.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-amor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/amor.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-amor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/amor.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/amor.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/amor.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/amor.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/amor.png
-
- #>+ 15
- force-reedit:
-@@ -952,7 +967,7 @@
-
-
- #>+ 11
--amor.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/amordialog.cpp $(srcdir)/amor.cpp $(srcdir)/amorwidget.cpp $(srcdir)/main.cpp $(srcdir)/amoranim.cpp $(srcdir)/amorpm.cpp $(srcdir)/amorbubble.cpp $(srcdir)/amorconfig.cpp $(srcdir)/amortips.cpp AmorIface_skel.cpp amor.moc amorwidget.moc amordialog.moc amorbubble.moc
-+amor.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/amordialog.cpp $(srcdir)/amor.cpp $(srcdir)/amorwidget.cpp $(srcdir)/main.cpp $(srcdir)/amoranim.cpp $(srcdir)/amorpm.cpp $(srcdir)/amorbubble.cpp $(srcdir)/amorconfig.cpp $(srcdir)/amortips.cpp AmorIface_skel.cpp amorwidget.moc amor.moc amordialog.moc amorbubble.moc
- @echo 'creating amor.all_cpp.cpp ...'; \
- rm -f amor.all_cpp.files amor.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> amor.all_cpp.final; \
-@@ -998,7 +1013,7 @@
- nmcheck-am: nmcheck
- amordialog.lo: amordialog.moc
- amorbubble.o: amorbubble.moc
--amorwidget.o: amorwidget.moc
- amor.lo: amor.moc
-+amorwidget.o: amorwidget.moc
- amorbubble.lo: amorbubble.moc
- amordialog.o: amordialog.moc
-diff -Nrua kdetoys-3.4.0.orig/amor/data/Makefile.in kdetoys-3.4.0/amor/data/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/Makefile.in 2005-03-05 17:49:12.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 @@
+ mostlyclean-libtool:
+diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/blob/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/blob/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/animated/blob/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/animated/blob/Makefile.in 2005-05-25 08:40:54.750169712 +0200
+@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2365,8 +1529,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -343,7 +346,7 @@
- all: docs-am all-recursive
+@@ -404,7 +407,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -2374,7 +1538,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -381,9 +384,9 @@
+@@ -442,9 +445,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2386,70 +1550,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -420,7 +423,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 \
-@@ -432,7 +441,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; \
-@@ -440,7 +449,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)' ;; \
-@@ -461,7 +476,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 kdetoys-3.4.0.orig/amor/data/pics/Makefile.in kdetoys-3.4.0/amor/data/pics/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/Makefile.in 2005-03-05 17:49:12.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.
-@@ -175,6 +175,9 @@
+diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/bonhomme/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/bonhomme/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/animated/bonhomme/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/animated/bonhomme/Makefile.in 2005-05-25 08:40:54.761168714 +0200
+@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2459,8 +1563,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -327,7 +330,7 @@
- all: docs-am all-recursive
+@@ -367,7 +370,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -2468,7 +1572,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -365,9 +368,9 @@
+@@ -405,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2480,70 +1584,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -387,7 +390,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 \
-@@ -399,7 +408,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; \
-@@ -407,7 +416,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)' ;; \
-@@ -428,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 && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/animated/Makefile.in kdetoys-3.4.0/amor/data/pics/animated/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/animated/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/animated/Makefile.in 2005-03-05 17:49:12.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.
-@@ -175,6 +175,9 @@
+diff -rua kdetoys-3.4.1.orig/amor/data/pics/animated/eyes/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/eyes/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/animated/eyes/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/animated/eyes/Makefile.in 2005-05-25 08:40:54.772167715 +0200
+@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2553,8 +1597,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -327,7 +330,7 @@
- all: docs-am all-recursive
+@@ -353,7 +356,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -2562,7 +1606,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -365,9 +368,9 @@
+@@ -391,9 +394,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2574,69 +1618,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -387,7 +390,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 \
-@@ -399,7 +408,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; \
-@@ -407,7 +416,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)' ;; \
-@@ -428,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 && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/animated/blob/Makefile.in kdetoys-3.4.0/amor/data/pics/animated/blob/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/animated/blob/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/animated/blob/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/data/pics/animated/ghost/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/ghost/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/animated/ghost/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/animated/ghost/Makefile.in 2005-05-25 08:40:54.782166807 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -2647,7 +1631,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -341,7 +344,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -2656,7 +1640,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -379,9 +382,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2668,31 +1652,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -603,7 +606,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=blob_s3.png blob_r225.png blob_l_jet3.png blob_gl1.png blob_BeamUp6.png blob_fire8.png blob_z1.png blob_BeamUp8.png blob_sl3.png blob_fire11.png blob_f3.png blob_ex1.png blob_BeamUp7.png blob_jet4.png blob_BeamUp1.png blob_fire3.png blob_BeamDown7.png blob_e1.png blob_BeamDown4.png blob_r315.png blob_r_turn1.png blob_BeamUp10.png blob_l_turn3.png blob_l_turn1.png blob_fire4.png blob_z3.png blob_h1.png blob_jet2.png blob_g2.png blob_gl2.png blob_fire9.png blob_fire6.png blob_BeamUp3.png blob_r180.png blob_h3.png blob_l_turn4.png blob_BeamUp2.png blob_BeamDown2.png blob_z2.png blob_r_turn3.png blob_g1.png blob_r45.png blob_sl4.png blob_l_jet1.png blob_BeamDown3.png blob_f1.png blob_r135.png blob_sl2.png blob_r270.png blob_BeamUp4.png blob_b1.png blob_r_turn4.png blob_s1.png blob_fire5.png blob_BeamUp5.png blob_fire2.png blob_BeamUp9.png blob_f2.png blob_BeamDown9.png blob_BeamDown5.png blob_l_jet2.png blob_fire7.png blob_r90.png blob_jet1.png Makefile.in blob_BeamDown6.png blob_sl1.png blob_l_turn2.png blob_b2.png blob_s2.png blob_BeamDown8.png blob_r_turn2.png blob_h2.png blob_jet3.png blob.png blob_BeamDown1.png Makefile.am blob_fire10.png blob_gl3.png blob_l_jet4.png
-+KDE_DIST=blob_s3.png blob_r225.png blob_gl1.png blob_l_jet3.png blob_BeamUp6.png blob_fire8.png blob_z1.png blob_BeamUp8.png blob_f3.png blob_fire11.png blob_sl3.png blob_BeamUp7.png blob_ex1.png blob_jet4.png blob_BeamUp1.png blob_fire3.png blob_BeamDown7.png blob_e1.png blob_BeamDown4.png blob_r315.png blob_r_turn1.png blob_BeamUp10.png blob_fire4.png blob_l_turn3.png blob_l_turn1.png blob_z3.png blob_h1.png blob_jet2.png blob_g2.png blob_gl2.png blob_BeamUp3.png blob_fire9.png blob_fire6.png blob_r180.png blob_h3.png blob_BeamUp2.png blob_l_turn4.png blob_BeamDown2.png blob_z2.png blob_r_turn3.png blob_g1.png blob_r45.png blob_sl4.png blob_l_jet1.png blob_BeamDown3.png blob_r135.png blob_f1.png blob_sl2.png blob_r270.png blob_BeamUp4.png blob_b1.png blob_r_turn4.png blob_s1.png blob_fire5.png blob_BeamUp5.png blob_fire2.png blob_BeamUp9.png blob_f2.png blob_BeamDown9.png blob_BeamDown5.png blob_l_jet2.png blob_fire7.png blob_r90.png blob_jet1.png Makefile.in blob_BeamDown6.png blob_sl1.png blob_l_turn2.png blob_b2.png blob_s2.png blob_BeamDown8.png blob_r_turn2.png blob_h2.png blob_jet3.png blob.png blob_BeamDown1.png Makefile.am blob_fire10.png blob_l_jet4.png blob_gl3.png
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/animated/bonhomme/Makefile.in kdetoys-3.4.0/amor/data/pics/animated/bonhomme/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/animated/bonhomme/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/animated/bonhomme/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/data/pics/animated/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/animated/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/animated/Makefile.in 2005-05-25 08:40:54.737170893 +0200
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2702,8 +1665,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -367,7 +370,7 @@
- all: docs-am all-am
+@@ -327,7 +330,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -2711,7 +1674,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -405,9 +408,9 @@
+@@ -365,9 +368,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2723,30 +1686,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -566,7 +569,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=b-f.png bdrib4.png bpof5.png b-f2.png b3-r.png bgo3.png bh1.png bpof2.png b2.png bgo6.png bgo5.png bdrop.png bcol1.png bpof6.png bpof1.png b4.png bdrib7.png b4-r.png bdrib3.png salut.png sa1.png bdrib5.png b3.png bpof3.png bdrib1.png bgo2.png b1.png salut1.png sa2b.png bcol2.png b2-r.png bdrib2.png sa2c.png sa2a.png Makefile.in sa2.png bgo4.png b1-r.png bgo1.png Makefile.am bpof4.png bgo7.png bdrib6.png
-+KDE_DIST=b-f.png bdrib4.png bpof5.png b-f2.png b3-r.png bgo3.png bh1.png bpof2.png b2.png bgo6.png bgo5.png bdrop.png bcol1.png bpof6.png bpof1.png b4.png bdrib7.png b4-r.png bdrib3.png salut.png sa1.png bdrib5.png b3.png bdrib1.png bpof3.png bgo2.png b1.png salut1.png sa2b.png bcol2.png b2-r.png bdrib2.png sa2c.png sa2a.png Makefile.in sa2.png bgo4.png b1-r.png bgo1.png Makefile.am bdrib6.png bgo7.png bpof4.png
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/animated/eyes/Makefile.in kdetoys-3.4.0/amor/data/pics/animated/eyes/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/animated/eyes/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/animated/eyes/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/data/pics/animated/neko/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/neko/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/animated/neko/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/animated/neko/Makefile.in 2005-05-25 08:40:54.793165808 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -2778,30 +1720,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -552,7 +555,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=eye_z1.png eye_h2.png eye_z3.png eye_m2.png eye_z4.png eye_2.png eye_z2.png eye_d.png eye_s1.png eye_m7.png eye_m6.png eye_u.png eye_b.png eye_h4.png eye_e.png eye_s4.png eye_h3.png eye_h1.png eye_m5.png eye_l.png eye_m3.png Makefile.in eye_m4.png eye_s3.png eye_1.png eye_s2.png eye_z5.png Makefile.am eye_m1.png
-+KDE_DIST=eye_z1.png eye_h2.png eye_z3.png eye_m2.png eye_z4.png eye_2.png eye_z2.png eye_d.png eye_s1.png eye_m7.png eye_m6.png eye_u.png eye_b.png eye_h4.png eye_e.png eye_s4.png eye_h3.png eye_h1.png eye_m5.png eye_l.png eye_m3.png Makefile.in eye_m4.png eye_1.png eye_s3.png eye_s2.png eye_z5.png Makefile.am eye_m1.png
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/animated/ghost/Makefile.in kdetoys-3.4.0/amor/data/pics/animated/ghost/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/animated/ghost/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/animated/ghost/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/data/pics/animated/pingu/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/pingu/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/animated/pingu/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/animated/pingu/Makefile.in 2005-05-25 08:40:54.807164537 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -2812,7 +1733,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -341,7 +344,7 @@
+@@ -426,7 +429,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -2821,7 +1742,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -379,9 +382,9 @@
+@@ -464,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2833,21 +1754,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/animated/neko/Makefile.in kdetoys-3.4.0/amor/data/pics/animated/neko/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/animated/neko/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/animated/neko/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/data/pics/animated/tao/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/tao/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/animated/tao/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/animated/tao/Makefile.in 2005-05-25 08:40:54.819163448 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -2858,7 +1767,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -353,7 +356,7 @@
+@@ -372,7 +375,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -2867,7 +1776,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -391,9 +394,9 @@
+@@ -410,9 +413,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2879,30 +1788,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -552,7 +555,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=run2.png claw2.png jump4.png jump1.png scratch4.png yawn.png lick2.png jump2.png surprise.png scratch2.png scratch1.png run3.png jumpl2.png run4.png jumpl4.png sleep2.png sleep1.png claw1.png jumpl1.png scratch3.png jump3.png lick.png Makefile.in tail.png sitleft.png jumpl3.png sit.png run1.png Makefile.am
-+KDE_DIST=run2.png claw2.png jump4.png jump1.png scratch4.png yawn.png lick2.png jump2.png surprise.png scratch2.png scratch1.png jumpl2.png run3.png run4.png jumpl4.png sleep2.png sleep1.png claw1.png jumpl1.png scratch3.png jump3.png lick.png Makefile.in tail.png sitleft.png jumpl3.png Makefile.am run1.png sit.png
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/animated/pingu/Makefile.in kdetoys-3.4.0/amor/data/pics/animated/pingu/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/animated/pingu/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/animated/pingu/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/data/pics/animated/worm/Makefile.in kdetoys-3.4.1/amor/data/pics/animated/worm/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/animated/worm/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/animated/worm/Makefile.in 2005-05-25 08:40:54.830162449 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -2913,7 +1801,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -362,7 +365,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -2922,7 +1810,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -400,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2934,31 +1822,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -625,7 +628,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=walk_l4.png bash_r2.png walk_r1.png digger2.png floater7.png floater3.png blocker1.png bash_l3.png bash_r7.png bash_r3.png tumble7.png walk_l1.png faller5.png bash_l5.png floater5.png digger1.png bomber7.png walk_l5.png blocker4.png blocker2.png bomber16.png faller4.png walk_r6.png walk_l3.png bash_r11.png bash_l4.png tumble6.png bash_r9.png bash_r5.png floater1.png bash_l1.png bomber11.png tumble5.png digger9.png walk_l7.png bomber6.png bash_r12.png bash_l10.png tumble3.png bash_r10.png walk_l2.png walk_l8.png floater6.png tumble8.png bash_r8.png bomber15.png digger10.png blocker6.png bash_l9.png tumble1.png bomber10.png bash_l2.png bash_l11.png walk_r5.png digger12.png bash_l8.png digger11.png bomber12.png floater2.png digger4.png floater4.png bash_l12.png floater8.png bomber2.png walk_r4.png faller6.png bash_r6.png bomber14.png digger5.png bomber5.png bomber3.png bash_r1.png walk_l6.png digger7.png faller7.png digger8.png bomber4.png digger3.png digger6.png digger13.png faller1.png walk_r3.png Makefile.in bash_r4.png bomber13.png bomber9.png faller3.png bomber8.png tumble2.png walk_r2.png tumble4.png digger14.png bomber1.png faller2.png bash_l6.png walk_r7.png faller8.png walk_r8.png bash_l7.png blocker3.png Makefile.am blocker5.png
-+KDE_DIST=bash_r2.png walk_l4.png walk_r1.png digger2.png floater7.png floater3.png blocker1.png bash_l3.png bash_r7.png bash_r3.png tumble7.png walk_l1.png faller5.png bash_l5.png bomber7.png floater5.png digger1.png blocker4.png walk_l5.png blocker2.png bomber16.png faller4.png bash_r11.png walk_r6.png walk_l3.png bash_l4.png bash_r9.png bash_r5.png tumble6.png floater1.png bash_l1.png bomber11.png tumble5.png digger9.png bomber6.png walk_l7.png bash_r12.png bash_l10.png tumble3.png bash_r10.png walk_l2.png walk_l8.png floater6.png tumble8.png bash_r8.png bomber15.png blocker6.png bash_l9.png digger10.png tumble1.png bomber10.png bash_l2.png bash_l11.png walk_r5.png bash_l8.png digger12.png digger11.png bomber12.png floater2.png digger4.png floater4.png bash_l12.png bomber2.png floater8.png faller6.png walk_r4.png bash_r6.png bomber14.png bomber5.png bomber3.png digger5.png bash_r1.png walk_l6.png digger7.png faller7.png bomber4.png digger8.png digger3.png digger13.png digger6.png faller1.png walk_r3.png Makefile.in bash_r4.png bomber13.png bomber9.png faller3.png bomber8.png tumble2.png walk_r2.png bomber1.png digger14.png tumble4.png faller2.png bash_l6.png walk_r7.png faller8.png walk_r8.png bash_l7.png Makefile.am blocker3.png blocker5.png
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/animated/tao/Makefile.in kdetoys-3.4.0/amor/data/pics/animated/tao/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/animated/tao/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/animated/tao/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/data/pics/Makefile.in kdetoys-3.4.1/amor/data/pics/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/Makefile.in 2005-05-25 08:40:54.726171891 +0200
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2968,8 +1835,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -372,7 +375,7 @@
- all: docs-am all-am
+@@ -327,7 +330,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -2977,7 +1844,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -410,9 +413,9 @@
+@@ -365,9 +368,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2989,30 +1856,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -571,7 +574,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=yy-9.png yy-4.png yy135.png yy330.png yy120.png yy180.png yyx24.png yy-8.png yyx6.png yy195.png yyx18.png yy-3.png yy45.png yyx22.png yyx14.png yy-5.png yy90.png yyx26.png yyx28.png yy270.png yy.png yy-6.png yy210.png yy-2.png yy285.png yy300.png yy105.png yy-1.png yyx16.png yy15.png yyx30.png yy150.png yy-7.png yyx8.png yyx12.png yy315.png yy30.png Makefile.in yy60.png yy255.png yy75.png yy225.png yyx10.png yy345.png yyx20.png yy240.png Makefile.am yy165.png
-+KDE_DIST=yy-9.png yy-4.png yy135.png yy330.png yy120.png yy180.png yyx24.png yy-8.png yy195.png yyx6.png yyx18.png yy-3.png yy45.png yyx22.png yyx14.png yy-5.png yy90.png yyx26.png yy.png yyx28.png yy270.png yy-6.png yy210.png yy-2.png yy285.png yy300.png yy105.png yy-1.png yyx16.png yy15.png yyx30.png yy150.png yy-7.png yyx12.png yy315.png yyx8.png yy30.png Makefile.in yy60.png yy255.png yy75.png yy225.png yyx10.png yy345.png yyx20.png yy240.png Makefile.am yy165.png
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/animated/worm/Makefile.in kdetoys-3.4.0/amor/data/pics/animated/worm/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/animated/worm/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/animated/worm/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/data/pics/preview/Makefile.in kdetoys-3.4.1/amor/data/pics/preview/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/preview/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/preview/Makefile.in 2005-05-25 08:40:54.839161632 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -3023,7 +1869,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -362,7 +365,7 @@
+@@ -326,7 +329,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -3032,7 +1878,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -400,9 +403,9 @@
+@@ -364,9 +367,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3044,30 +1890,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -561,7 +564,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=w-s2.png w-u2.png w-mr0.png w-wr2.png w-mr1.png w-mr3.png w-u3.png w-dr1.png w-d3.png w-l3.png w-mr2.png w-d4.png w-s3.png w-be4.png w-d5.png w-wl2.png w-a2.png w-wr1.png w-d1.png w-be1.png w-wl1.png w-be3.png w-b2.png w-b1.png w-l2.png w-e1.png Makefile.in w-d2.png w-u1.png w-ml3.png w-s1.png w-ml0.png w-ml1.png w-l1.png w-be2.png w-ml2.png w-a1.png Makefile.am
-+KDE_DIST=w-s2.png w-u2.png w-mr0.png w-wr2.png w-mr1.png w-mr3.png w-u3.png w-d3.png w-dr1.png w-l3.png w-mr2.png w-d4.png w-s3.png w-be4.png w-d5.png w-wl2.png w-a2.png w-wr1.png w-d1.png w-be1.png w-wl1.png w-b2.png w-be3.png w-b1.png w-l2.png w-e1.png Makefile.in w-d2.png w-u1.png w-ml3.png w-s1.png w-ml0.png w-ml1.png w-l1.png w-be2.png w-ml2.png w-a1.png Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/preview/Makefile.in kdetoys-3.4.0/amor/data/pics/preview/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/preview/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/preview/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/data/pics/static/Makefile.in kdetoys-3.4.1/amor/data/pics/static/Makefile.in
+--- kdetoys-3.4.1.orig/amor/data/pics/static/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/data/pics/static/Makefile.in 2005-05-25 08:40:54.849160724 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -3099,22 +1924,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdetoys-3.4.0.orig/amor/data/pics/static/Makefile.in kdetoys-3.4.0/amor/data/pics/static/Makefile.in
---- kdetoys-3.4.0.orig/amor/data/pics/static/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/amor/data/pics/static/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/amor/Makefile.in kdetoys-3.4.1/amor/Makefile.in
+--- kdetoys-3.4.1.orig/amor/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/amor/Makefile.in 2005-05-25 08:40:54.704173889 +0200
+@@ -232,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3124,16 +1937,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -326,7 +329,7 @@
- all: docs-am all-am
+@@ -413,7 +416,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*) \
-@@ -364,9 +367,9 @@
+@@ -451,9 +454,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3143,11 +1956,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:
-diff -Nrua kdetoys-3.4.0.orig/configure kdetoys-3.4.0/configure
---- kdetoys-3.4.0.orig/configure 2005-03-04 07:41:21.000000000 -0500
-+++ kdetoys-3.4.0/configure 2005-03-05 17:49:17.000000000 -0500
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+diff -rua kdetoys-3.4.1.orig/configure kdetoys-3.4.1/configure
+--- kdetoys-3.4.1.orig/configure 2005-05-23 18:12:46.000000000 +0200
++++ kdetoys-3.4.1/configure 2005-05-25 08:40:57.888884721 +0200
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -3307,17 +2120,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4273,8 +4290,7 @@
+@@ -4250,8 +4267,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=$?
+@@ -4362,8 +4378,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=$?
-@@ -4362,8 +4378,7 @@
+@@ -4451,8 +4466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3327,7 +2150,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4465,8 +4480,7 @@
+@@ -4554,8 +4568,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3337,7 +2160,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4565,8 +4579,7 @@
+@@ -4654,8 +4667,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3347,7 +2170,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4650,8 +4663,7 @@
+@@ -4739,8 +4751,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3357,7 +2180,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4740,8 +4752,7 @@
+@@ -4829,8 +4840,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3367,7 +2190,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4828,8 +4839,7 @@
+@@ -4917,8 +4927,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3377,7 +2200,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4916,8 +4926,7 @@
+@@ -5005,8 +5014,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3387,7 +2210,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5023,8 +5032,7 @@
+@@ -5112,8 +5120,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3397,7 +2220,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5111,8 +5119,7 @@
+@@ -5200,8 +5207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3407,7 +2230,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5199,8 +5206,7 @@
+@@ -5288,8 +5294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3417,7 +2240,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5287,8 +5293,7 @@
+@@ -5376,8 +5381,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3427,7 +2250,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5419,8 +5424,7 @@
+@@ -5508,8 +5512,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3437,7 +2260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5508,8 +5512,7 @@
+@@ -5597,8 +5600,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3447,7 +2270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5596,8 +5599,7 @@
+@@ -5685,8 +5687,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3457,7 +2280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5684,8 +5686,7 @@
+@@ -5773,8 +5774,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3467,7 +2290,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5772,8 +5773,7 @@
+@@ -5861,8 +5861,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3477,7 +2300,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5860,8 +5860,7 @@
+@@ -5949,8 +5948,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3487,7 +2310,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6284,8 +6283,7 @@
+@@ -6373,8 +6371,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3497,7 +2320,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6411,8 +6409,7 @@
+@@ -6500,8 +6497,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3507,7 +2330,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6500,8 +6497,7 @@
+@@ -6589,8 +6585,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3517,7 +2340,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6584,185 +6580,6 @@
+@@ -6673,185 +6668,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3703,7 +2526,7 @@
fi
-@@ -6951,10 +6768,10 @@
+@@ -7040,10 +6856,10 @@
fi
done
done
@@ -3715,7 +2538,7 @@
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
-@@ -7188,31 +7005,23 @@
+@@ -7277,31 +7093,23 @@
;;
cygwin*)
@@ -3755,7 +2578,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7251,42 +7060,21 @@
+@@ -7340,42 +7148,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -3805,7 +2628,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
-@@ -7315,9 +7103,6 @@
+@@ -7404,9 +7191,6 @@
;;
osf3* | osf4* | osf5*)
@@ -3815,7 +2638,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7327,7 +7112,6 @@
+@@ -7416,7 +7200,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -3823,16 +2646,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7404,7 +7188,7 @@
+@@ -7493,7 +7276,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7407 "configure"' > conftest.$ac_ext
-+ echo '#line 7191 "configure"' > conftest.$ac_ext
+- echo '#line 7496 "configure"' > conftest.$ac_ext
++ echo '#line 7279 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7449,12 +7233,11 @@
+@@ -7538,12 +7321,11 @@
(exit $ac_status); }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -3846,7 +2669,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7466,7 +7249,6 @@
+@@ -7555,7 +7337,6 @@
esac
;;
*64-bit*)
@@ -3854,7 +2677,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7526,8 +7308,7 @@
+@@ -7615,8 +7396,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3864,7 +2687,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7602,8 +7383,7 @@
+@@ -7691,8 +7471,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3874,7 +2697,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7773,8 +7553,7 @@
+@@ -7862,8 +7641,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3884,7 +2707,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7841,8 +7620,7 @@
+@@ -7930,8 +7708,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3894,16 +2717,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8049,7 +7827,7 @@
+@@ -8138,7 +7915,7 @@
# Provide some information about the compiler.
--echo "$as_me:8052:" \
-+echo "$as_me:7830:" \
+-echo "$as_me:8141:" \
++echo "$as_me:7918:" \
"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
-@@ -8095,8 +7873,7 @@
+@@ -8184,8 +7961,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3913,7 +2736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8145,8 +7922,7 @@
+@@ -8234,8 +8010,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3923,7 +2746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8204,7 +7980,7 @@
+@@ -8293,7 +8068,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -3932,7 +2755,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8233,20 +8009,26 @@
+@@ -8322,20 +8097,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -3964,7 +2787,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.
-@@ -8314,7 +8096,7 @@
+@@ -8403,7 +8184,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -3973,7 +2796,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8332,7 +8114,7 @@
+@@ -8421,7 +8202,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -3982,35 +2805,35 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9081,11 +8863,11 @@
+@@ -9170,11 +8951,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9084: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8866: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9173: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8954: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9088: \$? = $ac_status" >&5
-+ echo "$as_me:8870: \$? = $ac_status" >&5
+- echo "$as_me:9177: \$? = $ac_status" >&5
++ echo "$as_me:8958: \$? = $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
-@@ -9314,11 +9096,11 @@
+@@ -9403,11 +9184,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9317: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9099: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9406: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9187: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9321: \$? = $ac_status" >&5
-+ echo "$as_me:9103: \$? = $ac_status" >&5
+- echo "$as_me:9410: \$? = $ac_status" >&5
++ echo "$as_me:9191: \$? = $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
-@@ -9365,13 +9147,6 @@
+@@ -9454,13 +9235,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4024,21 +2847,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.
-@@ -9381,11 +9156,11 @@
+@@ -9470,11 +9244,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9384: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9159: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9473: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9247: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9388: \$? = $ac_status" >&5
-+ echo "$as_me:9163: \$? = $ac_status" >&5
+- echo "$as_me:9477: \$? = $ac_status" >&5
++ echo "$as_me:9251: \$? = $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
-@@ -9395,8 +9170,11 @@
+@@ -9484,8 +9258,11 @@
fi
fi
chmod u+w .
@@ -4052,7 +2875,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9524,7 +9302,7 @@
+@@ -9613,7 +9390,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4061,7 +2884,7 @@
else
ld_shlibs=no
fi
-@@ -9534,13 +9312,13 @@
+@@ -9623,13 +9400,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'
@@ -4077,7 +2900,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
-@@ -9549,19 +9327,19 @@
+@@ -9638,19 +9415,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4101,7 +2924,7 @@
fi
;;
-@@ -9579,8 +9357,8 @@
+@@ -9668,8 +9445,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4112,7 +2935,7 @@
else
ld_shlibs=no
fi
-@@ -9593,10 +9371,36 @@
+@@ -9682,10 +9459,36 @@
hardcode_shlibpath_var=no
;;
@@ -4151,7 +2974,7 @@
else
ld_shlibs=no
fi
-@@ -9646,9 +9450,20 @@
+@@ -9735,9 +9538,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
@@ -4174,7 +2997,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9694,21 +9509,22 @@
+@@ -9783,21 +9597,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4202,7 +3025,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9732,8 +9548,7 @@
+@@ -9821,8 +9636,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4212,7 +3035,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9760,14 +9575,13 @@
+@@ -9849,14 +9663,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4230,7 +3053,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9794,8 +9608,7 @@
+@@ -9883,8 +9696,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4240,7 +3063,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9833,7 +9646,7 @@
+@@ -9922,7 +9734,7 @@
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -4249,7 +3072,7 @@
fi
fi
;;
-@@ -9856,13 +9669,13 @@
+@@ -9945,13 +9757,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -4266,7 +3089,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.
-@@ -9876,21 +9689,21 @@
+@@ -9965,21 +9777,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -4301,7 +3124,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -9899,18 +9712,18 @@
+@@ -9988,18 +9800,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -4326,7 +3149,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -9951,8 +9764,8 @@
+@@ -10040,8 +9852,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4337,7 +3160,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9960,7 +9773,7 @@
+@@ -10049,7 +9861,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4346,7 +3169,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
-@@ -9978,10 +9791,10 @@
+@@ -10067,10 +9879,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -4359,7 +3182,7 @@
;;
esac
else
-@@ -10028,7 +9841,7 @@
+@@ -10117,7 +9929,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4368,7 +3191,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'
-@@ -10038,7 +9851,7 @@
+@@ -10127,7 +9939,7 @@
link_all_deplibs=yes
;;
@@ -4377,7 +3200,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10061,7 +9874,7 @@
+@@ -10150,7 +9962,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
@@ -4386,7 +3209,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10071,7 +9884,7 @@
+@@ -10160,7 +9972,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -4395,7 +3218,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10082,14 +9895,14 @@
+@@ -10171,14 +9983,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -4412,7 +3235,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'
-@@ -10101,7 +9914,7 @@
+@@ -10190,7 +10002,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -4421,7 +3244,7 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10126,9 +9939,9 @@
+@@ -10215,9 +10027,9 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -4433,7 +3256,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~
-@@ -10148,7 +9961,7 @@
+@@ -10237,7 +10049,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.
@@ -4442,7 +3265,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10208,9 +10021,9 @@
+@@ -10297,9 +10109,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -4454,7 +3277,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10316,7 +10129,7 @@
+@@ -10405,7 +10217,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4463,7 +3286,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10326,7 +10139,20 @@
+@@ -10415,7 +10227,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4485,7 +3308,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10391,7 +10217,7 @@
+@@ -10480,7 +10305,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4494,7 +3317,7 @@
;;
beos*)
-@@ -10416,7 +10242,7 @@
+@@ -10505,7 +10330,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -4503,7 +3326,7 @@
need_version=no
need_lib_prefix=no
-@@ -10481,7 +10307,7 @@
+@@ -10570,7 +10395,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -4512,7 +3335,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"`
-@@ -10504,7 +10330,7 @@
+@@ -10593,7 +10418,7 @@
dynamic_linker=no
;;
@@ -4521,7 +3344,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10564,7 +10390,7 @@
+@@ -10653,7 +10478,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -4530,7 +3353,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10579,7 +10405,7 @@
+@@ -10668,7 +10493,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4539,7 +3362,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10590,7 +10416,7 @@
+@@ -10679,7 +10504,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4548,7 +3371,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10652,22 +10478,19 @@
+@@ -10741,22 +10566,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'
@@ -4577,7 +3400,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,
-@@ -10677,6 +10500,30 @@
+@@ -10766,6 +10588,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4608,7 +3431,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10686,7 +10533,7 @@
+@@ -10775,7 +10621,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4617,7 +3440,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10715,7 +10562,7 @@
+@@ -10804,7 +10650,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -4626,7 +3449,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
-@@ -10735,7 +10582,7 @@
+@@ -10824,7 +10670,7 @@
os2*)
libname_spec='$name'
@@ -4635,7 +3458,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10964,8 +10811,7 @@
+@@ -11053,8 +10899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4645,7 +3468,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11068,8 +10914,7 @@
+@@ -11157,8 +11002,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4655,7 +3478,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11134,8 +10979,7 @@
+@@ -11223,8 +11067,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4665,7 +3488,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11228,8 +11072,7 @@
+@@ -11317,8 +11160,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4675,7 +3498,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11294,8 +11137,7 @@
+@@ -11383,8 +11225,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4685,7 +3508,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11361,8 +11203,7 @@
+@@ -11450,8 +11291,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4695,7 +3518,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11428,8 +11269,7 @@
+@@ -11517,8 +11357,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4705,25 +3528,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11504,7 +11344,7 @@
+@@ -11593,7 +11432,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11507 "configure"
-+#line 11347 "configure"
+-#line 11596 "configure"
++#line 11435 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11602,7 +11442,7 @@
+@@ -11691,7 +11530,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11605 "configure"
-+#line 11445 "configure"
+-#line 11694 "configure"
++#line 11533 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11727,7 +11567,7 @@
+@@ -11816,7 +11655,7 @@
fi
;;
@@ -4732,7 +3555,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11737,29 +11577,29 @@
+@@ -11826,29 +11665,29 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -4776,7 +3599,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -11793,7 +11633,8 @@
+@@ -11882,7 +11721,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.
@@ -4786,7 +3609,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 \
-@@ -11971,7 +11812,7 @@
+@@ -12060,7 +11900,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4795,7 +3618,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12002,7 +11843,7 @@
+@@ -12091,7 +11931,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4804,7 +3627,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12244,7 +12085,10 @@
+@@ -12333,7 +12173,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.
@@ -4816,7 +3639,7 @@
fi
-@@ -12512,8 +12356,8 @@
+@@ -12601,8 +12444,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
@@ -4827,7 +3650,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12539,7 +12383,7 @@
+@@ -12628,7 +12471,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.
@@ -4836,7 +3659,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12570,8 +12414,22 @@
+@@ -12659,8 +12502,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -4861,7 +3684,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12617,15 +12475,16 @@
+@@ -12706,15 +12563,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4882,7 +3705,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.
-@@ -12655,8 +12514,7 @@
+@@ -12744,8 +12602,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4892,7 +3715,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12685,13 +12543,12 @@
+@@ -12774,13 +12631,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -4908,7 +3731,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12718,8 +12575,7 @@
+@@ -12807,8 +12663,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4918,7 +3741,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12757,7 +12613,7 @@
+@@ -12846,7 +12701,7 @@
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -4927,7 +3750,7 @@
fi
fi
;;
-@@ -12774,12 +12630,12 @@
+@@ -12863,12 +12718,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'
@@ -4942,7 +3765,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
-@@ -12788,7 +12644,7 @@
+@@ -12877,7 +12732,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4951,7 +3774,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -12799,20 +12655,20 @@
+@@ -12888,20 +12743,20 @@
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -4982,7 +3805,7 @@
fi
;;
esac
-@@ -12822,19 +12678,19 @@
+@@ -12911,19 +12766,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5008,7 +3831,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
-@@ -12869,7 +12725,7 @@
+@@ -12958,7 +12813,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -5017,7 +3840,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12891,7 +12747,7 @@
+@@ -12980,7 +12835,7 @@
ld_shlibs_CXX=no
;;
aCC)
@@ -5026,7 +3849,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12900,11 +12756,11 @@
+@@ -12989,11 +12844,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.
@@ -5040,7 +3863,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12961,7 +12817,7 @@
+@@ -13050,7 +12905,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -5049,7 +3872,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -12982,7 +12838,7 @@
+@@ -13071,7 +12926,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -5058,7 +3881,7 @@
;;
esac
fi
-@@ -12997,7 +12853,7 @@
+@@ -13086,7 +12941,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -5067,7 +3890,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13008,9 +12864,9 @@
+@@ -13097,9 +12952,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -5079,7 +3902,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13027,8 +12883,8 @@
+@@ -13116,8 +12971,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.
@@ -5090,7 +3913,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13050,16 +12906,16 @@
+@@ -13139,16 +12994,16 @@
# Intel C++
with_gnu_ld=yes
archive_cmds_need_lc_CXX=no
@@ -5111,7 +3934,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13097,7 +12953,7 @@
+@@ -13186,7 +13041,7 @@
;;
esac
;;
@@ -5120,7 +3943,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=
-@@ -13116,7 +12972,7 @@
+@@ -13205,7 +13060,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.
@@ -5129,7 +3952,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13133,7 +12989,7 @@
+@@ -13222,7 +13077,7 @@
;;
cxx)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -5138,7 +3961,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13151,7 +13007,7 @@
+@@ -13240,7 +13095,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -5147,7 +3970,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13176,7 +13032,7 @@
+@@ -13265,7 +13120,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.
@@ -5156,7 +3979,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13192,10 +13048,10 @@
+@@ -13281,10 +13136,10 @@
;;
cxx)
allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -5169,7 +3992,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13214,7 +13070,7 @@
+@@ -13303,7 +13158,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -5178,7 +4001,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13271,9 +13127,9 @@
+@@ -13360,9 +13215,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
no_undefined_flag_CXX=' -zdefs'
@@ -5190,7 +4013,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -13307,7 +13163,7 @@
+@@ -13396,7 +13251,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -5199,7 +4022,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13317,9 +13173,9 @@
+@@ -13406,9 +13261,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
@@ -5211,7 +4034,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13328,9 +13184,9 @@
+@@ -13417,9 +13272,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -5223,7 +4046,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13445,7 +13301,7 @@
+@@ -13534,7 +13389,7 @@
fi
;;
@@ -5232,7 +4055,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13580,7 +13436,7 @@
+@@ -13669,7 +13524,7 @@
;;
esac
;;
@@ -5241,7 +4064,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13656,7 +13512,7 @@
+@@ -13745,7 +13600,7 @@
;;
esac
;;
@@ -5250,21 +4073,21 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13767,11 +13623,11 @@
+@@ -13856,11 +13711,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13770: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13626: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13859: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13714: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13774: \$? = $ac_status" >&5
-+ echo "$as_me:13630: \$? = $ac_status" >&5
+- echo "$as_me:13863: \$? = $ac_status" >&5
++ echo "$as_me:13718: \$? = $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
-@@ -13818,13 +13674,6 @@
+@@ -13907,13 +13762,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5278,21 +4101,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.
-@@ -13834,11 +13683,11 @@
+@@ -13923,11 +13771,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13837: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13686: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13926: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13774: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13841: \$? = $ac_status" >&5
-+ echo "$as_me:13690: \$? = $ac_status" >&5
+- echo "$as_me:13930: \$? = $ac_status" >&5
++ echo "$as_me:13778: \$? = $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
-@@ -13848,8 +13697,11 @@
+@@ -13937,8 +13785,11 @@
fi
fi
chmod u+w .
@@ -5306,7 +4129,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13901,6 +13753,9 @@
+@@ -13990,6 +13841,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'
;;
@@ -5316,7 +4139,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -13982,7 +13837,7 @@
+@@ -14071,7 +13925,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5325,7 +4148,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -13992,7 +13847,20 @@
+@@ -14081,7 +13935,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5347,7 +4170,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14057,7 +13925,7 @@
+@@ -14146,7 +14013,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5356,7 +4179,7 @@
;;
beos*)
-@@ -14082,7 +13950,7 @@
+@@ -14171,7 +14038,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5365,7 +4188,7 @@
need_version=no
need_lib_prefix=no
-@@ -14147,7 +14015,7 @@
+@@ -14236,7 +14103,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5374,7 +4197,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"`
-@@ -14170,7 +14038,7 @@
+@@ -14259,7 +14126,7 @@
dynamic_linker=no
;;
@@ -5383,7 +4206,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14230,7 +14098,7 @@
+@@ -14319,7 +14186,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -5392,7 +4215,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14245,7 +14113,7 @@
+@@ -14334,7 +14201,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5401,7 +4224,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14256,7 +14124,7 @@
+@@ -14345,7 +14212,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5410,7 +4233,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14318,22 +14186,19 @@
+@@ -14407,22 +14274,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'
@@ -5439,7 +4262,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,
-@@ -14343,6 +14208,30 @@
+@@ -14432,6 +14296,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5470,7 +4293,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14352,7 +14241,7 @@
+@@ -14441,7 +14329,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5479,7 +4302,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14381,7 +14270,7 @@
+@@ -14470,7 +14358,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5488,7 +4311,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
-@@ -14401,7 +14290,7 @@
+@@ -14490,7 +14378,7 @@
os2*)
libname_spec='$name'
@@ -5497,7 +4320,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14630,8 +14519,7 @@
+@@ -14719,8 +14607,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5507,7 +4330,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14734,8 +14622,7 @@
+@@ -14823,8 +14710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5517,7 +4340,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14800,8 +14687,7 @@
+@@ -14889,8 +14775,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5527,7 +4350,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14894,8 +14780,7 @@
+@@ -14983,8 +14868,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5537,7 +4360,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14960,8 +14845,7 @@
+@@ -15049,8 +14933,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5547,7 +4370,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15027,8 +14911,7 @@
+@@ -15116,8 +14999,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5557,7 +4380,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15094,8 +14977,7 @@
+@@ -15183,8 +15065,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5567,25 +4390,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15170,7 +15052,7 @@
+@@ -15259,7 +15140,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15173 "configure"
-+#line 15055 "configure"
+-#line 15262 "configure"
++#line 15143 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15268,7 +15150,7 @@
+@@ -15357,7 +15238,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15271 "configure"
-+#line 15153 "configure"
+-#line 15360 "configure"
++#line 15241 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15385,7 +15267,8 @@
+@@ -15474,7 +15355,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.
@@ -5595,7 +4418,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 \
-@@ -15515,7 +15398,7 @@
+@@ -15604,7 +15486,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5604,7 +4427,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15546,7 +15429,7 @@
+@@ -15635,7 +15517,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5613,7 +4436,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15763,7 +15646,10 @@
+@@ -15852,7 +15734,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.
@@ -5625,7 +4448,7 @@
fi
-@@ -15865,7 +15751,7 @@
+@@ -15954,7 +15839,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -5634,21 +4457,21 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -16091,11 +15977,11 @@
+@@ -16180,11 +16065,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16094: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15980: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16183: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16068: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16098: \$? = $ac_status" >&5
-+ echo "$as_me:15984: \$? = $ac_status" >&5
+- echo "$as_me:16187: \$? = $ac_status" >&5
++ echo "$as_me:16072: \$? = $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
-@@ -16142,13 +16028,6 @@
+@@ -16231,13 +16116,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5662,21 +4485,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.
-@@ -16158,11 +16037,11 @@
+@@ -16247,11 +16125,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16161: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16040: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16250: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16128: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16165: \$? = $ac_status" >&5
-+ echo "$as_me:16044: \$? = $ac_status" >&5
+- echo "$as_me:16254: \$? = $ac_status" >&5
++ echo "$as_me:16132: \$? = $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
-@@ -16172,8 +16051,11 @@
+@@ -16261,8 +16139,11 @@
fi
fi
chmod u+w .
@@ -5690,7 +4513,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16301,7 +16183,7 @@
+@@ -16390,7 +16271,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5699,7 +4522,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16311,13 +16193,13 @@
+@@ -16400,13 +16281,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'
@@ -5715,7 +4538,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
-@@ -16326,19 +16208,19 @@
+@@ -16415,19 +16296,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5739,7 +4562,7 @@
fi
;;
-@@ -16356,8 +16238,8 @@
+@@ -16445,8 +16326,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5750,7 +4573,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16370,10 +16252,36 @@
+@@ -16459,10 +16340,36 @@
hardcode_shlibpath_var_F77=no
;;
@@ -5789,7 +4612,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16423,9 +16331,20 @@
+@@ -16512,9 +16419,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
@@ -5812,7 +4635,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16471,21 +16390,22 @@
+@@ -16560,21 +16478,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5840,7 +4663,7 @@
program main
end
-@@ -16499,8 +16419,7 @@
+@@ -16588,8 +16507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5850,7 +4673,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16527,14 +16446,13 @@
+@@ -16616,14 +16534,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5868,7 +4691,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16551,8 +16469,7 @@
+@@ -16640,8 +16557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5878,7 +4701,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16590,7 +16507,7 @@
+@@ -16679,7 +16595,7 @@
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -5887,7 +4710,7 @@
fi
fi
;;
-@@ -16613,13 +16530,13 @@
+@@ -16702,13 +16618,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -5904,7 +4727,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.
-@@ -16633,21 +16550,21 @@
+@@ -16722,21 +16638,21 @@
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -5939,7 +4762,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -16656,18 +16573,18 @@
+@@ -16745,18 +16661,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5964,7 +4787,7 @@
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -16708,8 +16625,8 @@
+@@ -16797,8 +16713,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5975,7 +4798,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16717,7 +16634,7 @@
+@@ -16806,7 +16722,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5984,7 +4807,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
-@@ -16735,10 +16652,10 @@
+@@ -16824,10 +16740,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -5997,7 +4820,7 @@
;;
esac
else
-@@ -16785,7 +16702,7 @@
+@@ -16874,7 +16790,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -6006,7 +4829,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'
-@@ -16795,7 +16712,7 @@
+@@ -16884,7 +16800,7 @@
link_all_deplibs_F77=yes
;;
@@ -6015,7 +4838,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
-@@ -16818,7 +16735,7 @@
+@@ -16907,7 +16823,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
@@ -6024,7 +4847,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16828,7 +16745,7 @@
+@@ -16917,7 +16833,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -6033,7 +4856,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16839,14 +16756,14 @@
+@@ -16928,14 +16844,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -6050,7 +4873,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'
-@@ -16858,7 +16775,7 @@
+@@ -16947,7 +16863,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -6059,7 +4882,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16883,9 +16800,9 @@
+@@ -16972,9 +16888,9 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -6071,7 +4894,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~
-@@ -16905,7 +16822,7 @@
+@@ -16994,7 +16910,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.
@@ -6080,7 +4903,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16965,9 +16882,9 @@
+@@ -17054,9 +16970,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -6092,7 +4915,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17073,7 +16990,7 @@
+@@ -17162,7 +17078,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6101,7 +4924,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17083,7 +17000,20 @@
+@@ -17172,7 +17088,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6123,7 +4946,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17148,7 +17078,7 @@
+@@ -17237,7 +17166,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6132,7 +4955,7 @@
;;
beos*)
-@@ -17173,7 +17103,7 @@
+@@ -17262,7 +17191,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6141,7 +4964,7 @@
need_version=no
need_lib_prefix=no
-@@ -17238,7 +17168,7 @@
+@@ -17327,7 +17256,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6150,7 +4973,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"`
-@@ -17261,7 +17191,7 @@
+@@ -17350,7 +17279,7 @@
dynamic_linker=no
;;
@@ -6159,7 +4982,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17321,7 +17251,7 @@
+@@ -17410,7 +17339,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -6168,7 +4991,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17336,7 +17266,7 @@
+@@ -17425,7 +17354,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6177,7 +5000,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17347,7 +17277,7 @@
+@@ -17436,7 +17365,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6186,7 +5009,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17409,22 +17339,19 @@
+@@ -17498,22 +17427,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'
@@ -6215,7 +5038,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,
-@@ -17434,6 +17361,30 @@
+@@ -17523,6 +17449,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6246,7 +5069,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17443,7 +17394,7 @@
+@@ -17532,7 +17482,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6255,7 +5078,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17472,7 +17423,7 @@
+@@ -17561,7 +17511,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6264,7 +5087,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
-@@ -17492,7 +17443,7 @@
+@@ -17581,7 +17531,7 @@
os2*)
libname_spec='$name'
@@ -6273,7 +5096,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17671,7 +17622,8 @@
+@@ -17760,7 +17710,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.
@@ -6283,7 +5106,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 \
-@@ -17801,7 +17753,7 @@
+@@ -17890,7 +17841,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6292,7 +5115,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17832,7 +17784,7 @@
+@@ -17921,7 +17872,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6301,7 +5124,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18049,7 +18001,10 @@
+@@ -18138,7 +18089,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.
@@ -6313,35 +5136,35 @@
fi
-@@ -18131,11 +18086,11 @@
+@@ -18220,11 +18174,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18134: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18089: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18223: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18177: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18138: \$? = $ac_status" >&5
-+ echo "$as_me:18093: \$? = $ac_status" >&5
+- echo "$as_me:18227: \$? = $ac_status" >&5
++ echo "$as_me:18181: \$? = $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
-@@ -18364,11 +18319,11 @@
+@@ -18453,11 +18407,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18367: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18322: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18456: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18410: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18371: \$? = $ac_status" >&5
-+ echo "$as_me:18326: \$? = $ac_status" >&5
+- echo "$as_me:18460: \$? = $ac_status" >&5
++ echo "$as_me:18414: \$? = $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
-@@ -18415,13 +18370,6 @@
+@@ -18504,13 +18458,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6355,21 +5178,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.
-@@ -18431,11 +18379,11 @@
+@@ -18520,11 +18467,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18434: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18382: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18523: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18470: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18438: \$? = $ac_status" >&5
-+ echo "$as_me:18386: \$? = $ac_status" >&5
+- echo "$as_me:18527: \$? = $ac_status" >&5
++ echo "$as_me:18474: \$? = $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
-@@ -18445,8 +18393,11 @@
+@@ -18534,8 +18481,11 @@
fi
fi
chmod u+w .
@@ -6383,7 +5206,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18574,7 +18525,7 @@
+@@ -18663,7 +18613,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -6392,7 +5215,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18584,13 +18535,13 @@
+@@ -18673,13 +18623,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'
@@ -6408,7 +5231,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
-@@ -18599,19 +18550,19 @@
+@@ -18688,19 +18638,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6432,7 +5255,7 @@
fi
;;
-@@ -18629,8 +18580,8 @@
+@@ -18718,8 +18668,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6443,7 +5266,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18643,10 +18594,36 @@
+@@ -18732,10 +18682,36 @@
hardcode_shlibpath_var_GCJ=no
;;
@@ -6482,7 +5305,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18696,9 +18673,20 @@
+@@ -18785,9 +18761,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
@@ -6505,7 +5328,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18744,21 +18732,22 @@
+@@ -18833,21 +18820,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6533,7 +5356,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18782,8 +18771,7 @@
+@@ -18871,8 +18859,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6543,7 +5366,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18810,14 +18798,13 @@
+@@ -18899,14 +18886,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -6561,7 +5384,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18844,8 +18831,7 @@
+@@ -18933,8 +18919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6571,7 +5394,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18883,7 +18869,7 @@
+@@ -18972,7 +18957,7 @@
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -6580,7 +5403,7 @@
fi
fi
;;
-@@ -18906,13 +18892,13 @@
+@@ -18995,13 +18980,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -6597,7 +5420,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.
-@@ -18926,21 +18912,21 @@
+@@ -19015,21 +19000,21 @@
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -6632,7 +5455,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -18949,18 +18935,18 @@
+@@ -19038,18 +19023,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -6657,7 +5480,7 @@
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -19001,8 +18987,8 @@
+@@ -19090,8 +19075,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6668,7 +5491,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19010,7 +18996,7 @@
+@@ -19099,7 +19084,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -6677,7 +5500,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
-@@ -19028,10 +19014,10 @@
+@@ -19117,10 +19102,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -6690,7 +5513,7 @@
;;
esac
else
-@@ -19078,7 +19064,7 @@
+@@ -19167,7 +19152,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -6699,7 +5522,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'
-@@ -19088,7 +19074,7 @@
+@@ -19177,7 +19162,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -6708,7 +5531,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
-@@ -19111,7 +19097,7 @@
+@@ -19200,7 +19185,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
@@ -6717,7 +5540,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19121,7 +19107,7 @@
+@@ -19210,7 +19195,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -6726,7 +5549,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19132,14 +19118,14 @@
+@@ -19221,14 +19206,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -6743,7 +5566,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'
-@@ -19151,7 +19137,7 @@
+@@ -19240,7 +19225,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -6752,7 +5575,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19176,9 +19162,9 @@
+@@ -19265,9 +19250,9 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -6764,7 +5587,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~
-@@ -19198,7 +19184,7 @@
+@@ -19287,7 +19272,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.
@@ -6773,7 +5596,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19258,9 +19244,9 @@
+@@ -19347,9 +19332,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -6785,7 +5608,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19366,7 +19352,7 @@
+@@ -19455,7 +19440,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6794,7 +5617,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19376,7 +19362,20 @@
+@@ -19465,7 +19450,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6816,7 +5639,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19441,7 +19440,7 @@
+@@ -19530,7 +19528,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6825,7 +5648,7 @@
;;
beos*)
-@@ -19466,7 +19465,7 @@
+@@ -19555,7 +19553,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6834,7 +5657,7 @@
need_version=no
need_lib_prefix=no
-@@ -19531,7 +19530,7 @@
+@@ -19620,7 +19618,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6843,7 +5666,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"`
-@@ -19554,7 +19553,7 @@
+@@ -19643,7 +19641,7 @@
dynamic_linker=no
;;
@@ -6852,7 +5675,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19614,7 +19613,7 @@
+@@ -19703,7 +19701,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -6861,7 +5684,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19629,7 +19628,7 @@
+@@ -19718,7 +19716,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6870,7 +5693,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19640,7 +19639,7 @@
+@@ -19729,7 +19727,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6879,7 +5702,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19702,22 +19701,19 @@
+@@ -19791,22 +19789,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'
@@ -6908,7 +5731,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,
-@@ -19727,6 +19723,30 @@
+@@ -19816,6 +19811,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6939,7 +5762,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19736,7 +19756,7 @@
+@@ -19825,7 +19844,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6948,7 +5771,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19765,7 +19785,7 @@
+@@ -19854,7 +19873,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6957,7 +5780,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
-@@ -19785,7 +19805,7 @@
+@@ -19874,7 +19893,7 @@
os2*)
libname_spec='$name'
@@ -6966,7 +5789,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20014,8 +20034,7 @@
+@@ -20103,8 +20122,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6976,7 +5799,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20118,8 +20137,7 @@
+@@ -20207,8 +20225,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6986,7 +5809,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20184,8 +20202,7 @@
+@@ -20273,8 +20290,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6996,7 +5819,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20278,8 +20295,7 @@
+@@ -20367,8 +20383,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7006,7 +5829,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20344,8 +20360,7 @@
+@@ -20433,8 +20448,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7016,7 +5839,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20411,8 +20426,7 @@
+@@ -20500,8 +20514,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7026,7 +5849,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20478,8 +20492,7 @@
+@@ -20567,8 +20580,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7036,25 +5859,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20554,7 +20567,7 @@
+@@ -20643,7 +20655,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20557 "configure"
-+#line 20570 "configure"
+-#line 20646 "configure"
++#line 20658 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20652,7 +20665,7 @@
+@@ -20741,7 +20753,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20655 "configure"
-+#line 20668 "configure"
+-#line 20744 "configure"
++#line 20756 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20769,7 +20782,8 @@
+@@ -20858,7 +20870,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.
@@ -7064,7 +5887,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 \
-@@ -20899,7 +20913,7 @@
+@@ -20988,7 +21001,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7073,7 +5896,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20930,7 +20944,7 @@
+@@ -21019,7 +21032,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7082,7 +5905,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21147,7 +21161,10 @@
+@@ -21236,7 +21249,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.
@@ -7094,7 +5917,7 @@
fi
-@@ -21210,7 +21227,8 @@
+@@ -21299,7 +21315,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.
@@ -7104,7 +5927,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 \
-@@ -21340,7 +21358,7 @@
+@@ -21429,7 +21446,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7113,7 +5936,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21371,7 +21389,7 @@
+@@ -21460,7 +21477,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7122,7 +5945,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21588,7 +21606,10 @@
+@@ -21677,7 +21694,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.
@@ -7134,7 +5957,7 @@
fi
-@@ -21635,7 +21656,7 @@
+@@ -21724,7 +21744,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -7143,7 +5966,7 @@
# Prevent multiple expansion
-@@ -21872,8 +21893,7 @@
+@@ -21961,8 +21981,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7153,7 +5976,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -21947,9 +21967,6 @@
+@@ -22036,9 +22055,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7163,7 +5986,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21983,8 +22000,7 @@
+@@ -22072,8 +22088,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7173,7 +5996,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22088,8 +22104,7 @@
+@@ -22177,8 +22192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7183,7 +6006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22168,9 +22183,6 @@
+@@ -22257,9 +22271,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7193,7 +6016,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22203,8 +22215,7 @@
+@@ -22292,8 +22303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7203,7 +6026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22307,8 +22318,7 @@
+@@ -22396,8 +22406,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7213,7 +6036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22398,8 +22408,7 @@
+@@ -22487,8 +22496,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7223,7 +6046,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22460,8 +22469,7 @@
+@@ -22549,8 +22557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7233,7 +6056,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22529,8 +22537,7 @@
+@@ -22618,8 +22625,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7243,7 +6066,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22596,8 +22603,7 @@
+@@ -22685,8 +22691,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7253,7 +6076,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22690,8 +22696,7 @@
+@@ -22779,8 +22784,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7263,7 +6086,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22769,8 +22774,7 @@
+@@ -22858,8 +22862,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7273,7 +6096,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22854,8 +22858,7 @@
+@@ -22943,8 +22946,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7283,7 +6106,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22923,8 +22926,7 @@
+@@ -23012,8 +23014,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7293,7 +6116,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23019,8 +23021,7 @@
+@@ -23108,8 +23109,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7303,7 +6126,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23084,8 +23085,7 @@
+@@ -23173,8 +23173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7313,7 +6136,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23180,8 +23180,7 @@
+@@ -23269,8 +23268,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7323,7 +6146,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23245,8 +23244,7 @@
+@@ -23334,8 +23332,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7333,7 +6156,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23342,8 +23340,7 @@
+@@ -23431,8 +23428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7343,7 +6166,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23407,8 +23404,7 @@
+@@ -23496,8 +23492,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7353,7 +6176,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23505,8 +23501,7 @@
+@@ -23594,8 +23589,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7363,7 +6186,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23571,8 +23566,7 @@
+@@ -23660,8 +23654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7373,7 +6196,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23640,8 +23634,7 @@
+@@ -23729,8 +23722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7383,7 +6206,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23792,8 +23785,7 @@
+@@ -23881,8 +23873,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7393,7 +6216,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23948,8 +23940,7 @@
+@@ -24037,8 +24028,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7403,7 +6226,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24014,8 +24005,7 @@
+@@ -24103,8 +24093,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7413,7 +6236,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24162,8 +24152,7 @@
+@@ -24251,8 +24240,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7423,7 +6246,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24318,8 +24307,7 @@
+@@ -24407,8 +24395,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7433,7 +6256,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24375,9 +24363,6 @@
+@@ -24464,9 +24451,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7443,7 +6266,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24411,8 +24396,7 @@
+@@ -24500,8 +24484,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7453,7 +6276,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24516,8 +24500,7 @@
+@@ -24605,8 +24588,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7463,7 +6286,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24617,8 +24600,7 @@
+@@ -24706,8 +24688,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7473,7 +6296,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24692,8 +24674,7 @@
+@@ -24781,8 +24762,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7483,7 +6306,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24756,8 +24737,7 @@
+@@ -24845,8 +24825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7493,7 +6316,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24819,8 +24799,7 @@
+@@ -24908,8 +24887,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7503,7 +6326,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24860,8 +24839,7 @@
+@@ -24949,8 +24927,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7513,7 +6336,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24917,8 +24895,7 @@
+@@ -25006,8 +24983,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7523,7 +6346,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24958,8 +24935,7 @@
+@@ -25047,8 +25023,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7533,7 +6356,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25023,8 +24999,7 @@
+@@ -25112,8 +25087,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7543,7 +6366,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25055,10 +25030,8 @@
+@@ -25144,10 +25118,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7556,7 +6379,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25169,8 +25142,7 @@
+@@ -25258,8 +25230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7566,7 +6389,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25232,8 +25204,7 @@
+@@ -25321,8 +25292,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7576,7 +6399,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25273,8 +25244,7 @@
+@@ -25362,8 +25332,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7586,7 +6409,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25330,8 +25300,7 @@
+@@ -25419,8 +25388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7596,7 +6419,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25371,8 +25340,7 @@
+@@ -25460,8 +25428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7606,7 +6429,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25436,8 +25404,7 @@
+@@ -25525,8 +25492,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7616,7 +6439,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25468,10 +25435,8 @@
+@@ -25557,10 +25523,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7629,7 +6452,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25582,8 +25547,7 @@
+@@ -25671,8 +25635,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7639,7 +6462,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25645,8 +25609,7 @@
+@@ -25734,8 +25697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7649,7 +6472,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25686,8 +25649,7 @@
+@@ -25775,8 +25737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7659,7 +6482,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25743,8 +25705,7 @@
+@@ -25832,8 +25793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7669,7 +6492,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25784,8 +25745,7 @@
+@@ -25873,8 +25833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7679,7 +6502,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25849,8 +25809,7 @@
+@@ -25938,8 +25897,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7689,7 +6512,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25881,10 +25840,8 @@
+@@ -25970,10 +25928,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7702,7 +6525,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25995,8 +25952,7 @@
+@@ -26084,8 +26040,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7712,7 +6535,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26058,8 +26014,7 @@
+@@ -26147,8 +26102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7722,7 +6545,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26099,8 +26054,7 @@
+@@ -26188,8 +26142,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7732,7 +6555,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26156,8 +26110,7 @@
+@@ -26245,8 +26198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7742,7 +6565,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26197,8 +26150,7 @@
+@@ -26286,8 +26238,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7752,7 +6575,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26262,8 +26214,7 @@
+@@ -26351,8 +26302,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7762,7 +6585,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26294,10 +26245,8 @@
+@@ -26383,10 +26333,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7775,7 +6598,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26416,8 +26365,7 @@
+@@ -26505,8 +26453,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7785,7 +6608,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26488,8 +26436,7 @@
+@@ -26577,8 +26524,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7795,7 +6618,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26559,8 +26506,7 @@
+@@ -26648,8 +26594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7805,7 +6628,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26622,8 +26568,7 @@
+@@ -26711,8 +26656,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7815,7 +6638,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26663,8 +26608,7 @@
+@@ -26752,8 +26696,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7825,7 +6648,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26720,8 +26664,7 @@
+@@ -26809,8 +26752,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7835,7 +6658,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26761,8 +26704,7 @@
+@@ -26850,8 +26792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7845,7 +6668,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26826,8 +26768,7 @@
+@@ -26915,8 +26856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7855,7 +6678,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26858,10 +26799,8 @@
+@@ -26947,10 +26887,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7868,7 +6691,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26973,8 +26912,7 @@
+@@ -27062,8 +27000,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7878,7 +6701,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27036,8 +26974,7 @@
+@@ -27125,8 +27062,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7888,7 +6711,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27077,8 +27014,7 @@
+@@ -27166,8 +27102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7898,7 +6721,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27134,8 +27070,7 @@
+@@ -27223,8 +27158,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7908,7 +6731,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27175,8 +27110,7 @@
+@@ -27264,8 +27198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7918,7 +6741,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27240,8 +27174,7 @@
+@@ -27329,8 +27262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7928,7 +6751,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27272,10 +27205,8 @@
+@@ -27361,10 +27293,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7941,7 +6764,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27386,8 +27317,7 @@
+@@ -27475,8 +27405,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7951,7 +6774,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27457,8 +27387,7 @@
+@@ -27546,8 +27475,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7961,7 +6784,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27638,8 +27567,7 @@
+@@ -27727,8 +27655,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7971,7 +6794,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27748,8 +27676,7 @@
+@@ -27837,8 +27764,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7981,7 +6804,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27973,8 +27900,7 @@
+@@ -28062,8 +27988,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7991,7 +6814,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28197,8 +28123,7 @@
+@@ -28286,8 +28211,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8001,7 +6824,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28274,8 +28199,7 @@
+@@ -28363,8 +28287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8011,7 +6834,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28498,8 +28422,7 @@
+@@ -28587,8 +28510,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8021,7 +6844,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28574,8 +28497,7 @@
+@@ -28663,8 +28585,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8031,7 +6854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28635,8 +28557,7 @@
+@@ -28724,8 +28645,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8041,7 +6864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28719,8 +28640,7 @@
+@@ -28808,8 +28728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8051,7 +6874,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28813,8 +28733,7 @@
+@@ -28902,8 +28821,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8061,7 +6884,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28988,8 +28907,7 @@
+@@ -29077,8 +28995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8071,7 +6894,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29087,8 +29005,7 @@
+@@ -29176,8 +29093,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8081,7 +6904,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29181,8 +29098,7 @@
+@@ -29270,8 +29186,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8091,7 +6914,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29265,8 +29181,7 @@
+@@ -29354,8 +29269,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8101,25 +6924,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29319,7 +29234,7 @@
+@@ -29408,7 +29322,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29322: $i/$j" >&5
-+ echo "configure: 29237: $i/$j" >&5
+- echo "configure: 29411: $i/$j" >&5
++ echo "configure: 29325: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29627,7 +29542,7 @@
+@@ -29716,7 +29630,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29630: $i/$j" >&5
-+ echo "configure: 29545: $i/$j" >&5
+- echo "configure: 29719: $i/$j" >&5
++ echo "configure: 29633: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30304,8 +30219,7 @@
+@@ -30393,8 +30307,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8129,43 +6952,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30464,7 +30378,7 @@
+@@ -30553,7 +30466,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30467: $i/$j" >&5
-+ echo "configure: 30381: $i/$j" >&5
+- echo "configure: 30556: $i/$j" >&5
++ echo "configure: 30469: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30494,7 +30408,7 @@
+@@ -30583,7 +30496,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30497: $i/$j" >&5
-+ echo "configure: 30411: $i/$j" >&5
+- echo "configure: 30586: $i/$j" >&5
++ echo "configure: 30499: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30512,7 +30426,7 @@
+@@ -30601,7 +30514,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
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_widgetdir=$i
-@@ -32014,7 +31928,7 @@
+@@ -32119,7 +32032,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32017: $i/$j" >&5
-+ echo "configure: 31931: $i/$j" >&5
+- echo "configure: 32122: $i/$j" >&5
++ echo "configure: 32035: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32210,8 +32124,7 @@
+@@ -32315,8 +32228,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8175,7 +6998,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32298,8 +32211,7 @@
+@@ -32403,8 +32315,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8185,7 +7008,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32386,8 +32298,7 @@
+@@ -32491,8 +32402,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8195,7 +7018,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32474,8 +32385,7 @@
+@@ -32579,8 +32489,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8205,7 +7028,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32553,9 +32463,6 @@
+@@ -32673,8 +32582,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=$?
+@@ -32758,9 +32666,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8215,7 +7048,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32586,8 +32493,7 @@
+@@ -32791,8 +32696,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8225,7 +7058,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32688,8 +32594,7 @@
+@@ -32893,8 +32797,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8235,7 +7068,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32768,9 +32673,6 @@
+@@ -32973,9 +32876,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8245,7 +7078,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32801,8 +32703,7 @@
+@@ -33006,8 +32906,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8255,7 +7088,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32903,8 +32804,7 @@
+@@ -33108,8 +33007,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8265,7 +7098,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32983,9 +32883,6 @@
+@@ -33188,9 +33086,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -8275,7 +7108,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33021,8 +32918,7 @@
+@@ -33226,8 +33121,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8285,7 +7118,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33128,8 +33024,7 @@
+@@ -33333,8 +33227,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8295,7 +7128,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33511,6 +33406,13 @@
+@@ -33716,6 +33609,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -8309,7 +7142,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
-@@ -34225,6 +34127,9 @@
+@@ -34430,6 +34330,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -8319,7 +7152,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -34581,11 +34486,6 @@
+@@ -34786,11 +34689,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -8331,7 +7164,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. */
-@@ -34624,6 +34524,12 @@
+@@ -34829,6 +34727,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -8344,34 +7177,22 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nrua kdetoys-3.4.0.orig/configure.in kdetoys-3.4.0/configure.in
---- kdetoys-3.4.0.orig/configure.in 2005-03-04 07:40:47.000000000 -0500
-+++ kdetoys-3.4.0/configure.in 2005-03-05 17:48:12.000000000 -0500
+diff -rua kdetoys-3.4.1.orig/configure.in kdetoys-3.4.1/configure.in
+--- kdetoys-3.4.1.orig/configure.in 2005-05-23 18:12:13.000000000 +0200
++++ kdetoys-3.4.1/configure.in 2005-05-25 08:40:11.525094756 +0200
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdetoys, "3.4.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdetoys, "3.4.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-diff -Nrua kdetoys-3.4.0.orig/doc/Makefile.in kdetoys-3.4.0/doc/Makefile.in
---- kdetoys-3.4.0.orig/doc/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/doc/Makefile.in 2005-03-05 17:49:12.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.
-@@ -175,6 +175,9 @@
+diff -rua kdetoys-3.4.1.orig/doc/amor/Makefile.in kdetoys-3.4.1/doc/amor/Makefile.in
+--- kdetoys-3.4.1.orig/doc/amor/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/doc/amor/Makefile.in 2005-05-25 08:40:54.872158636 +0200
+@@ -159,6 +159,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8381,15 +7202,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -325,13 +328,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. amor kodo kmoon kteatime kweather kworldclock
-+SUBDIRS =. amor kodo kmoon kweather kworldclock kteatime
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
+@@ -313,7 +316,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -8397,7 +7211,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -369,9 +372,9 @@
+@@ -351,9 +354,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8409,69 +7223,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -391,7 +394,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 \
-@@ -403,7 +412,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; \
-@@ -411,7 +420,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)' ;; \
-@@ -432,7 +447,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 kdetoys-3.4.0.orig/doc/amor/Makefile.in kdetoys-3.4.0/doc/amor/Makefile.in
---- kdetoys-3.4.0.orig/doc/amor/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/doc/amor/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/doc/kmoon/Makefile.in kdetoys-3.4.1/doc/kmoon/Makefile.in
+--- kdetoys-3.4.1.orig/doc/kmoon/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/doc/kmoon/Makefile.in 2005-05-25 08:40:54.882157728 +0200
@@ -159,6 +159,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8482,7 +7236,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -313,7 +316,7 @@
+@@ -312,7 +315,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8491,7 +7245,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -351,9 +354,9 @@
+@@ -350,9 +353,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8503,58 +7257,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -498,10 +501,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=billy.png tao.png bonhomme.png spot.png index.docbook pingus.png neko.png tux.png index.cache.bz2 man-amor.6.docbook ghost.png Makefile.in eyes.png bsd.png worm.png Makefile.am
-+KDE_DIST=billy.png tao.png bonhomme.png index.docbook spot.png pingus.png neko.png tux.png index.cache.bz2 man-amor.6.docbook ghost.png Makefile.in eyes.png bsd.png worm.png Makefile.am
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) billy.png bonhomme.png bsd.png eyes.png ghost.png index.docbook neko.png pingus.png spot.png tao.png tux.png worm.png man-amor.6.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.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
-@@ -528,20 +531,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor
-- @for base in billy.png bonhomme.png bsd.png eyes.png ghost.png index.docbook neko.png pingus.png spot.png tao.png tux.png worm.png man-amor.6.docbook ; do \
-+ @for base in eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor/$$base ;\
- done
-
- uninstall-nls:
-- for base in billy.png bonhomme.png bsd.png eyes.png ghost.png index.docbook neko.png pingus.png spot.png tao.png tux.png worm.png man-amor.6.docbook ; do \
-+ for base in eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in billy.png bonhomme.png bsd.png eyes.png ghost.png index.docbook neko.png pingus.png spot.png tao.png tux.png worm.png man-amor.6.docbook ; do \
-+ for file in eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nrua kdetoys-3.4.0.orig/doc/kmoon/Makefile.in kdetoys-3.4.0/doc/kmoon/Makefile.in
---- kdetoys-3.4.0.orig/doc/kmoon/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/doc/kmoon/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/doc/kodo/Makefile.in kdetoys-3.4.1/doc/kodo/Makefile.in
+--- kdetoys-3.4.1.orig/doc/kodo/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/doc/kodo/Makefile.in 2005-05-25 08:40:54.893156729 +0200
@@ -159,6 +159,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8586,54 +7291,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -500,7 +503,7 @@
- KDE_DIST=index.docbook carlosmail index.cache.bz2 Makefile.in Makefile.am
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) carlosmail index.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook carlosmail
- @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
-@@ -527,20 +530,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmoon
-- @for base in carlosmail index.docbook ; do \
-+ @for base in index.docbook carlosmail ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmoon/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmoon/$$base ;\
- done
-
- uninstall-nls:
-- for base in carlosmail index.docbook ; do \
-+ for base in index.docbook carlosmail ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmoon/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in carlosmail index.docbook ; do \
-+ for file in index.docbook carlosmail ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nrua kdetoys-3.4.0.orig/doc/kodo/Makefile.in kdetoys-3.4.0/doc/kodo/Makefile.in
---- kdetoys-3.4.0.orig/doc/kodo/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/doc/kodo/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/doc/kteatime/Makefile.in kdetoys-3.4.1/doc/kteatime/Makefile.in
+--- kdetoys-3.4.1.orig/doc/kteatime/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/doc/kteatime/Makefile.in 2005-05-25 08:40:54.902155912 +0200
@@ -159,6 +159,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8665,21 +7325,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdetoys-3.4.0.orig/doc/kteatime/Makefile.in kdetoys-3.4.0/doc/kteatime/Makefile.in
---- kdetoys-3.4.0.orig/doc/kteatime/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/doc/kteatime/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/doc/kweather/Makefile.in kdetoys-3.4.1/doc/kweather/Makefile.in
+--- kdetoys-3.4.1.orig/doc/kweather/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/doc/kweather/Makefile.in 2005-05-25 08:40:54.912155004 +0200
@@ -159,6 +159,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8711,21 +7359,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdetoys-3.4.0.orig/doc/kweather/Makefile.in kdetoys-3.4.0/doc/kweather/Makefile.in
---- kdetoys-3.4.0.orig/doc/kweather/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/doc/kweather/Makefile.in 2005-03-05 17:49:12.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 kdetoys-3.4.1.orig/doc/kworldclock/Makefile.in kdetoys-3.4.1/doc/kworldclock/Makefile.in
+--- kdetoys-3.4.1.orig/doc/kworldclock/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/doc/kworldclock/Makefile.in 2005-05-25 08:40:54.923154005 +0200
@@ -159,6 +159,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8736,7 +7372,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -312,7 +315,7 @@
+@@ -313,7 +316,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -8745,7 +7381,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -350,9 +353,9 @@
+@@ -351,9 +354,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8757,22 +7393,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdetoys-3.4.0.orig/doc/kworldclock/Makefile.in kdetoys-3.4.0/doc/kworldclock/Makefile.in
---- kdetoys-3.4.0.orig/doc/kworldclock/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/doc/kworldclock/Makefile.in 2005-03-05 17:49:12.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.
-@@ -159,6 +159,9 @@
+diff -rua kdetoys-3.4.1.orig/doc/Makefile.in kdetoys-3.4.1/doc/Makefile.in
+--- kdetoys-3.4.1.orig/doc/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/doc/Makefile.in 2005-05-25 08:40:54.861159635 +0200
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8782,8 +7406,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -313,7 +316,7 @@
- all: docs-am all-am
+@@ -331,7 +334,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -8791,7 +7415,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -351,9 +354,9 @@
+@@ -369,9 +372,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8803,81 +7427,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -498,10 +501,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=man-kworldclock.1.docbook screenshot-rmb-clock.png screenshot-rmb-daylight.png index.docbook screenshot-clock-dialog.png screenshot-quairading-clock.png screenshot-rmb-flags.png screenshot-withflags.png index.cache.bz2 screenshot-mlb.png screenshot.png screenshot-withclocks.png Makefile.in screenshot-quairading-dialog.png screenshot-rmb-cities.png Makefile.am
-+KDE_DIST=man-kworldclock.1.docbook screenshot-rmb-clock.png screenshot-rmb-daylight.png index.docbook screenshot-clock-dialog.png screenshot-quairading-clock.png screenshot-rmb-flags.png screenshot-withflags.png screenshot-mlb.png index.cache.bz2 screenshot.png screenshot-withclocks.png Makefile.in screenshot-quairading-dialog.png screenshot-rmb-cities.png Makefile.am
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot-clock-dialog.png screenshot-mlb.png screenshot-quairading-clock.png screenshot-quairading-dialog.png screenshot-rmb-cities.png screenshot-rmb-clock.png screenshot-rmb-daylight.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-withflags.png screenshot.png man-kworldclock.1.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.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
-@@ -528,20 +531,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock
-- @for base in index.docbook screenshot-clock-dialog.png screenshot-mlb.png screenshot-quairading-clock.png screenshot-quairading-dialog.png screenshot-rmb-cities.png screenshot-rmb-clock.png screenshot-rmb-daylight.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-withflags.png screenshot.png man-kworldclock.1.docbook ; do \
-+ @for base in screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook screenshot-clock-dialog.png screenshot-mlb.png screenshot-quairading-clock.png screenshot-quairading-dialog.png screenshot-rmb-cities.png screenshot-rmb-clock.png screenshot-rmb-daylight.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-withflags.png screenshot.png man-kworldclock.1.docbook ; do \
-+ for base in screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook screenshot-clock-dialog.png screenshot-mlb.png screenshot-quairading-clock.png screenshot-quairading-dialog.png screenshot-rmb-cities.png screenshot-rmb-clock.png screenshot-rmb-daylight.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-withflags.png screenshot.png man-kworldclock.1.docbook ; do \
-+ for file in screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nrua kdetoys-3.4.0.orig/eyesapplet/Makefile.in kdetoys-3.4.0/eyesapplet/Makefile.in
---- kdetoys-3.4.0.orig/eyesapplet/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/eyesapplet/Makefile.in 2005-03-05 17:49:13.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 = $(eyes_panelapplet_la_SOURCES)
- DIST_SOURCES = $(eyes_panelapplet_la_SOURCES)
+diff -rua kdetoys-3.4.1.orig/eyesapplet/Makefile.in kdetoys-3.4.1/eyesapplet/Makefile.in
+--- kdetoys-3.4.1.orig/eyesapplet/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/eyesapplet/Makefile.in 2005-05-25 08:40:54.939152553 +0200
@@ -206,6 +206,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8909,44 +7461,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdetoys-3.4.0.orig/fifteenapplet/Makefile.in kdetoys-3.4.0/fifteenapplet/Makefile.in
---- kdetoys-3.4.0.orig/fifteenapplet/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/fifteenapplet/Makefile.in 2005-03-05 17:49:13.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.
-@@ -79,18 +79,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 = $(fifteen_panelapplet_la_SOURCES)
- DIST_SOURCES = $(fifteen_panelapplet_la_SOURCES)
+diff -rua kdetoys-3.4.1.orig/fifteenapplet/Makefile.in kdetoys-3.4.1/fifteenapplet/Makefile.in
+--- kdetoys-3.4.1.orig/fifteenapplet/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/fifteenapplet/Makefile.in 2005-05-25 08:40:54.955151100 +0200
@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8978,44 +7495,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdetoys-3.4.0.orig/kmoon/Makefile.in kdetoys-3.4.0/kmoon/Makefile.in
---- kdetoys-3.4.0.orig/kmoon/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kmoon/Makefile.in 2005-03-05 17:49:13.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.
-@@ -79,18 +79,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 = $(kmoon_panelapplet_la_SOURCES)
- DIST_SOURCES = $(kmoon_panelapplet_la_SOURCES)
+diff -rua kdetoys-3.4.1.orig/kmoon/Makefile.in kdetoys-3.4.1/kmoon/Makefile.in
+--- kdetoys-3.4.1.orig/kmoon/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kmoon/Makefile.in 2005-05-25 08:40:54.978149012 +0200
@@ -222,6 +222,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9047,93 +7529,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -525,7 +528,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 \
-@@ -537,7 +546,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; \
-@@ -545,7 +554,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)' ;; \
-@@ -566,7 +581,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 \
-@@ -847,17 +862,17 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kmoon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmoon.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kmoon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmoon.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kmoon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmoon.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kmoon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmoon.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kmoon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmoon.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmoon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmoon.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmoon.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmoon.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmoon.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdetoys-3.4.0.orig/kmoon/pics/Makefile.in kdetoys-3.4.0/kmoon/pics/Makefile.in
---- kdetoys-3.4.0.orig/kmoon/pics/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kmoon/pics/Makefile.in 2005-03-05 17:49:13.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 kdetoys-3.4.1.orig/kmoon/pics/Makefile.in kdetoys-3.4.1/kmoon/pics/Makefile.in
+--- kdetoys-3.4.1.orig/kmoon/pics/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kmoon/pics/Makefile.in 2005-05-25 08:40:54.989148013 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9165,53 +7563,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -529,7 +532,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=moon3.png moon4.png moon24.png moon13.png moon5.png moon7.png moon25.png moon28.png moon29.png moon19.png moon2.png moon9.png moon26.png moon1.png moon17.png moon16.png moon14.png moon23.png moon11.png moon12.png moon6.png moon18.png Makefile.in moon22.png moon15.png moon8.png moon10.png moon21.png moon27.png moon20.png Makefile.am
-+KDE_DIST=moon3.png moon4.png moon24.png moon13.png moon5.png moon25.png moon7.png moon28.png moon29.png moon19.png moon2.png moon9.png moon26.png moon1.png moon17.png moon16.png moon14.png moon23.png moon11.png moon12.png moon18.png moon6.png Makefile.in moon22.png moon15.png moon8.png moon10.png moon21.png moon27.png moon20.png Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/kodo/Makefile.in kdetoys-3.4.0/kodo/Makefile.in
---- kdetoys-3.4.0.orig/kodo/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kodo/Makefile.in 2005-03-05 17:49:13.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 = $(kodo_SOURCES)
- DIST_SOURCES = $(kodo_SOURCES)
+diff -rua kdetoys-3.4.1.orig/kodo/Makefile.in kdetoys-3.4.1/kodo/Makefile.in
+--- kdetoys-3.4.1.orig/kodo/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kodo/Makefile.in 2005-05-25 08:40:55.010146107 +0200
@@ -211,6 +211,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9243,73 +7597,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -730,24 +733,24 @@
- -rm -f kimagenumber.moc kodometer.moc
-
- #>+ 2
--KDE_DIST=kimagenumber.h cr32-app-kodo.png numbers.png cr48-app-kodo.png configure.in.in cr16-app-kodo.png Makefile.in kodometer.h Makefile.am kodo.desktop
-+KDE_DIST=kimagenumber.h cr32-app-kodo.png numbers.png cr48-app-kodo.png configure.in.in cr16-app-kodo.png kodometer.h Makefile.in Makefile.am kodo.desktop
-
- #>+ 2
- docs-am:
-
- #>+ 13
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kodo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kodo.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-kodo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kodo.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kodo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kodo.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kodo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kodo.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kodo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kodo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kodo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kodo.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdetoys-3.4.0.orig/kteatime/Makefile.in kdetoys-3.4.0/kteatime/Makefile.in
---- kdetoys-3.4.0.orig/kteatime/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kteatime/Makefile.in 2005-03-05 17:49:13.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 = $(kteatime_SOURCES)
- DIST_SOURCES = $(kteatime_SOURCES)
+diff -rua kdetoys-3.4.1.orig/kteatime/Makefile.in kdetoys-3.4.1/kteatime/Makefile.in
+--- kdetoys-3.4.1.orig/kteatime/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kteatime/Makefile.in 2005-05-25 08:40:55.029144382 +0200
@@ -209,6 +209,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9341,95 +7631,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -737,35 +740,35 @@
-
- #>+ 31
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kteatime.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kteatime.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kteatime.png
-- $(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/16x16/apps/kteatime.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kteatime.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kteatime.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kteatime.png
-+ $(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/48x48/apps/kteatime.png
-+ $(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps/kteatime.png
- $(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-mug.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim1.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim2.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim2.png
-+ $(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/16x16/apps/kteatime.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tea_not_ready.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
-- $(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps/kteatime.png
-- $(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/48x48/apps/kteatime.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kteatime.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kteatime.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kteatime.png
-- -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/16x16/apps/kteatime.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kteatime.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kteatime.png
-+ -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/48x48/apps/kteatime.png
-+ -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps/kteatime.png
- -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
- -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
- -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim2.png
-+ -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/16x16/apps/kteatime.png
- -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
-- -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/32x32/apps/kteatime.png
-- -rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/48x48/apps/kteatime.png
-
- #>+ 15
- force-reedit:
-diff -Nrua kdetoys-3.4.0.orig/ktux/Makefile.in kdetoys-3.4.0/ktux/Makefile.in
---- kdetoys-3.4.0.orig/ktux/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/ktux/Makefile.in 2005-03-05 17:49:13.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 = $(ktux_SOURCES)
- DIST_SOURCES = $(ktux_SOURCES)
+diff -rua kdetoys-3.4.1.orig/ktux/Makefile.in kdetoys-3.4.1/ktux/Makefile.in
+--- kdetoys-3.4.1.orig/ktux/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/ktux/Makefile.in 2005-05-25 08:40:55.049142566 +0200
@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9461,69 +7665,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -543,7 +546,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 \
-@@ -555,7 +564,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; \
-@@ -563,7 +572,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)' ;; \
-@@ -584,7 +599,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 kdetoys-3.4.0.orig/ktux/sprites/Makefile.in kdetoys-3.4.0/ktux/sprites/Makefile.in
---- kdetoys-3.4.0.orig/ktux/sprites/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/ktux/sprites/Makefile.in 2005-03-05 17:49:13.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 kdetoys-3.4.1.orig/ktux/sprites/Makefile.in kdetoys-3.4.1/ktux/sprites/Makefile.in
+--- kdetoys-3.4.1.orig/ktux/sprites/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/ktux/sprites/Makefile.in 2005-05-25 08:40:55.058141749 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9555,54 +7699,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -529,7 +532,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=anim0003.png anim0002.png anim0007.png anim0004.png flare0002.png anim0010.png star0002.png bg.png spriterc anim0001.png anim0008.png flare0001.png anim0006.png Makefile.in star0001.png anim0009.png anim0005.png Makefile.am
-+KDE_DIST=anim0003.png anim0002.png anim0007.png anim0004.png flare0002.png anim0010.png star0002.png bg.png spriterc anim0001.png anim0008.png flare0001.png anim0006.png Makefile.in anim0009.png star0001.png anim0005.png Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/kweather/Makefile.in kdetoys-3.4.0/kweather/Makefile.in
---- kdetoys-3.4.0.orig/kweather/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kweather/Makefile.in 2005-03-05 17:49:13.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.
-@@ -165,18 +165,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_weather_la_SOURCES) $(kcm_weatherservice_la_SOURCES) \
- $(kweatherreport_la_SOURCES) $(weather_panelapplet_la_SOURCES) \
-@@ -326,6 +326,9 @@
+diff -rua kdetoys-3.4.1.orig/kweather/graphics/Makefile.in kdetoys-3.4.1/kweather/graphics/Makefile.in
+--- kdetoys-3.4.1.orig/kweather/graphics/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kweather/graphics/Makefile.in 2005-05-25 08:40:55.221126950 +0200
+@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9612,16 +7712,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -322,7 +325,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*) \
-@@ -606,9 +609,9 @@
+@@ -360,9 +363,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9631,139 +7731,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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -903,7 +906,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 \
-@@ -915,7 +924,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; \
-@@ -923,7 +932,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)' ;; \
-@@ -944,7 +959,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 \
-@@ -1259,18 +1274,18 @@
- mocs: kcmweather.moc
-
- #>+ 3
--weatherservice.moc: $(srcdir)/weatherservice.h
-- $(MOC) $(srcdir)/weatherservice.h -o weatherservice.moc
-+weatherlib.moc: $(srcdir)/weatherlib.h
-+ $(MOC) $(srcdir)/weatherlib.h -o weatherlib.moc
-
- #>+ 2
--mocs: weatherservice.moc
-+mocs: weatherlib.moc
-
- #>+ 3
--weatherlib.moc: $(srcdir)/weatherlib.h
-- $(MOC) $(srcdir)/weatherlib.h -o weatherlib.moc
-+weatherservice.moc: $(srcdir)/weatherservice.h
-+ $(MOC) $(srcdir)/weatherservice.h -o weatherservice.moc
-
- #>+ 2
--mocs: weatherlib.moc
-+mocs: weatherservice.moc
-
- #>+ 3
- kcmweatherservice.moc: $(srcdir)/kcmweatherservice.h
-@@ -1353,10 +1368,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f weatherbar.moc serviceconfigwidget.moc kcmweather.moc weatherservice.moc weatherlib.moc kcmweatherservice.moc kweather.moc dockwidget.moc reportview.moc weatherbutton.moc sidebarwidget.moc
-+ -rm -f weatherbar.moc serviceconfigwidget.moc kcmweather.moc weatherlib.moc weatherservice.moc kcmweatherservice.moc kweather.moc dockwidget.moc reportview.moc weatherbutton.moc sidebarwidget.moc
-
- #>+ 2
--KDE_DIST=kcmweatherservice.h weatherlog.sh reportview.h weatherbar_add.desktop kweatherservice.desktop cr32-app-kweather.png kcmweatherservice.desktop weatherIface.h kcmweather.desktop serviceconfigwidget.h weather_stations.desktop serviceconfigdata.ui weatherbar.h sidebarwidget.h kweather.h dockwidget.h cr48-app-kweather.png sun.h test.sh kweatherreport.desktop prefdialogdata.ui kweather.desktop weatherbar.desktop configure.in.in weatherbutton.h stationdatabase.h Makefile.in kweather.kdevprj cr16-app-kweather.png metar_parser.h kcmweather.h weatherservice.h stations.dat Makefile.am weathersig.sh weatherlib.h
-+KDE_DIST=kcmweatherservice.h weatherlog.sh reportview.h weatherbar_add.desktop kweatherservice.desktop cr32-app-kweather.png kcmweatherservice.desktop weatherIface.h kcmweather.desktop serviceconfigwidget.h serviceconfigdata.ui weather_stations.desktop weatherbar.h sidebarwidget.h cr48-app-kweather.png kweather.h dockwidget.h sun.h test.sh kweatherreport.desktop prefdialogdata.ui kweather.desktop weatherbar.desktop configure.in.in weatherbutton.h stationdatabase.h Makefile.in cr16-app-kweather.png kweather.kdevprj metar_parser.h kcmweather.h weatherservice.h stations.dat Makefile.am weathersig.sh weatherlib.h
-
- #>+ 10
- clean-idl:
-@@ -1384,16 +1399,16 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kweather.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kweather.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kweather.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kweather.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kweather.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kweather.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kweather.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kweather.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kweather.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kweather.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kweather.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kweather.png
-
- #>+ 15
-@@ -1483,7 +1498,7 @@
- rm -f weather_panelapplet_la.all_cpp.final weather_panelapplet_la.all_cpp.files
-
- #>+ 11
--kweatherservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/metar_parser.cpp $(srcdir)/weatherlib.cpp $(srcdir)/weatherservice.cpp $(srcdir)/stationdatabase.cpp $(srcdir)/sun.cpp weatherservice_skel.cpp weatherservice_stub.cpp weatherlib.moc weatherservice.moc
-+kweatherservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/metar_parser.cpp $(srcdir)/weatherlib.cpp $(srcdir)/weatherservice.cpp $(srcdir)/stationdatabase.cpp $(srcdir)/sun.cpp weatherservice_skel.cpp weatherservice_stub.cpp weatherservice.moc weatherlib.moc
- @echo 'creating kweatherservice.all_cpp.cpp ...'; \
- rm -f kweatherservice.all_cpp.files kweatherservice.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kweatherservice.all_cpp.final; \
-diff -Nrua kdetoys-3.4.0.orig/kweather/graphics/Makefile.in kdetoys-3.4.0/kweather/graphics/Makefile.in
---- kdetoys-3.4.0.orig/kweather/graphics/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kweather/graphics/Makefile.in 2005-03-05 17:49:13.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 @@
+ mostlyclean-libtool:
+diff -rua kdetoys-3.4.1.orig/kweather/Makefile.in kdetoys-3.4.1/kweather/Makefile.in
+--- kdetoys-3.4.1.orig/kweather/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kweather/Makefile.in 2005-05-25 08:40:55.210127949 +0200
+@@ -326,6 +326,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9773,16 +7746,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -322,7 +325,7 @@
- all: docs-am all-am
+@@ -568,7 +571,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*) \
-@@ -360,9 +363,9 @@
+@@ -606,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9792,68 +7765,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:
-@@ -521,7 +524,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=light_rain.png snow4.png sleet.png snow3_night.png sunny.png tstorm1_night.png shower1_night.png snow3.png snow2_night.png shower2_night.png shower1.png cloudy4_night.png cloudy3.png tstorm1.png mist_night.png cloudy5.png shower2.png snow1_night.png overcast.png snow5.png mist.png tstorm2_night.png hail.png tstorm3.png fog.png cloudy2_night.png cloudy1_night.png cloudy1.png snow1.png Makefile.in tstorm2.png cloudy4.png fog_night.png snow2.png shower3.png cloudy2.png cloudy3_night.png sunny_night.png Makefile.am dunno.png
-+KDE_DIST=light_rain.png snow4.png sleet.png snow3_night.png sunny.png tstorm1_night.png shower1_night.png shower2_night.png snow3.png snow2_night.png shower1.png cloudy4_night.png cloudy3.png mist_night.png tstorm1.png cloudy5.png shower2.png overcast.png snow1_night.png snow5.png mist.png tstorm2_night.png hail.png fog.png tstorm3.png cloudy2_night.png cloudy1_night.png cloudy1.png snow1.png Makefile.in tstorm2.png cloudy4.png fog_night.png snow2.png shower3.png cloudy2.png cloudy3_night.png sunny_night.png Makefile.am dunno.png
-
- #>+ 2
- docs-am:
-diff -Nrua kdetoys-3.4.0.orig/kworldwatch/Makefile.in kdetoys-3.4.0/kworldwatch/Makefile.in
---- kdetoys-3.4.0.orig/kworldwatch/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kworldwatch/Makefile.in 2005-03-05 17:49:13.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.
-@@ -94,29 +94,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --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 = $(libww_la_SOURCES) $(ww_panelapplet_la_SOURCES) \
- $(kworldclock_SOURCES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -rua kdetoys-3.4.1.orig/kworldwatch/Makefile.in kdetoys-3.4.1/kworldwatch/Makefile.in
+--- kdetoys-3.4.1.orig/kworldwatch/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kworldwatch/Makefile.in 2005-05-25 08:40:55.251124226 +0200
@@ -254,6 +254,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -9885,99 +7801,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -691,7 +694,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 \
-@@ -703,7 +712,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; \
-@@ -711,7 +720,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)' ;; \
-@@ -732,7 +747,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 \
-@@ -1017,7 +1032,7 @@
- -rm -f mapwidget.moc applet.moc main.moc zoneclock.moc
-
- #>+ 2
--KDE_DIST=astro.h flow.h kwwapplet.desktop cr32-app-kworldclock.png clock.ui main.h zoneclock.h maploader.h kdeworld.desktop cr48-app-kworldclock.png cr16-app-kworldclock.png kworldclock.desktop sunclock.h about.ui zone.tab flags.h Makefile.in cities.h mapwidget.h Makefile.am
-+KDE_DIST=astro.h flow.h cr32-app-kworldclock.png kwwapplet.desktop clock.ui main.h zoneclock.h maploader.h kdeworld.desktop cr48-app-kworldclock.png cr16-app-kworldclock.png kworldclock.desktop sunclock.h about.ui flags.h zone.tab Makefile.in cities.h mapwidget.h Makefile.am
-
- #>+ 5
- clean-ui:
-@@ -1034,16 +1049,16 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kworldclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kworldclock.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kworldclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kworldclock.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kworldclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kworldclock.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kworldclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kworldclock.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kworldclock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kworldclock.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kworldclock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kworldclock.png
-
- #>+ 15
-diff -Nrua kdetoys-3.4.0.orig/kworldwatch/maps/Makefile.in kdetoys-3.4.0/kworldwatch/maps/Makefile.in
---- kdetoys-3.4.0.orig/kworldwatch/maps/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kworldwatch/maps/Makefile.in 2005-03-05 17:49:13.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.
-@@ -175,6 +175,9 @@
+diff -rua kdetoys-3.4.1.orig/kworldwatch/maps/depths/Makefile.in kdetoys-3.4.1/kworldwatch/maps/depths/Makefile.in
+--- kdetoys-3.4.1.orig/kworldwatch/maps/depths/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kworldwatch/maps/depths/Makefile.in 2005-05-25 08:40:55.271122410 +0200
+@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9987,8 +7814,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -327,7 +330,7 @@
- all: docs-am all-recursive
+@@ -322,7 +325,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -9996,7 +7823,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -365,9 +368,9 @@
+@@ -360,9 +363,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10008,69 +7835,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -387,7 +390,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 \
-@@ -399,7 +408,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; \
-@@ -407,7 +416,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)' ;; \
-@@ -428,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 && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdetoys-3.4.0.orig/kworldwatch/maps/depths/Makefile.in kdetoys-3.4.0/kworldwatch/maps/depths/Makefile.in
---- kdetoys-3.4.0.orig/kworldwatch/maps/depths/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kworldwatch/maps/depths/Makefile.in 2005-03-05 17:49:13.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 kdetoys-3.4.1.orig/kworldwatch/maps/flatworld/Makefile.in kdetoys-3.4.1/kworldwatch/maps/flatworld/Makefile.in
+--- kdetoys-3.4.1.orig/kworldwatch/maps/flatworld/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kworldwatch/maps/flatworld/Makefile.in 2005-05-25 08:40:55.279121684 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10102,22 +7869,10 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdetoys-3.4.0.orig/kworldwatch/maps/flatworld/Makefile.in kdetoys-3.4.0/kworldwatch/maps/flatworld/Makefile.in
---- kdetoys-3.4.0.orig/kworldwatch/maps/flatworld/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kworldwatch/maps/flatworld/Makefile.in 2005-03-05 17:49:13.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 kdetoys-3.4.1.orig/kworldwatch/maps/Makefile.in kdetoys-3.4.1/kworldwatch/maps/Makefile.in
+--- kdetoys-3.4.1.orig/kworldwatch/maps/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kworldwatch/maps/Makefile.in 2005-05-25 08:40:55.261123318 +0200
+@@ -175,6 +175,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10127,8 +7882,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -322,7 +325,7 @@
- all: docs-am all-am
+@@ -327,7 +330,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -10136,7 +7891,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -360,9 +363,9 @@
+@@ -365,9 +368,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10148,21 +7903,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdetoys-3.4.0.orig/kworldwatch/pics/Makefile.in kdetoys-3.4.0/kworldwatch/pics/Makefile.in
---- kdetoys-3.4.0.orig/kworldwatch/pics/Makefile.in 2005-03-04 07:41:19.000000000 -0500
-+++ kdetoys-3.4.0/kworldwatch/pics/Makefile.in 2005-03-05 17:49:13.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 kdetoys-3.4.1.orig/kworldwatch/pics/Makefile.in kdetoys-3.4.1/kworldwatch/pics/Makefile.in
+--- kdetoys-3.4.1.orig/kworldwatch/pics/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/kworldwatch/pics/Makefile.in 2005-05-25 08:40:55.289120776 +0200
@@ -169,6 +169,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -10194,3 +7937,58 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+diff -rua kdetoys-3.4.1.orig/Makefile.in kdetoys-3.4.1/Makefile.in
+--- kdetoys-3.4.1.orig/Makefile.in 2005-05-23 18:12:44.000000000 +0200
++++ kdetoys-3.4.1/Makefile.in 2005-05-25 08:40:54.678176249 +0200
+@@ -192,6 +192,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@
+@@ -350,7 +353,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*) \
+@@ -392,12 +395,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
+@@ -409,7 +412,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 $@
+@@ -826,7 +829,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 kdetoys.lsm configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in
+
+ #>+ 2
+ docs-am: