[Pkg-kde-commits] rev 854 - branches/kde-3.4.0/packages/kdelibs/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Sat, 19 Mar 2005 00:44:08 +0100
Author: chrsmrtn-guest
Date: 2005-03-19 00:43:41 +0100 (Sat, 19 Mar 2005)
New Revision: 854
Removed:
branches/kde-3.4.0/packages/kdelibs/debian/patches/25_TMP_fix-ssl-include.diff
Modified:
branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
Update kdelibs buildprep.
Deleted: branches/kde-3.4.0/packages/kdelibs/debian/patches/25_TMP_fix-ssl-include.diff
Modified: branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff 2005-03-18 19:47:44 UTC (rev 853)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff 2005-03-18 23:43:41 UTC (rev 854)
@@ -1,11 +1,12 @@
#DPATCHLEVEL=1
-diff -u -x debian -Nru kdelibs-3.4.0.orig/Makefile.in kdelibs-3.4.0/Makefile.in
---- kdelibs-3.4.0.orig/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/Makefile.in 2005-03-04 20:41:26.657281891 +0100
+diff -Nrua kdelibs-3.4.0.orig/Makefile.in kdelibs-3.4.0/Makefile.in
+--- kdelibs-3.4.0.orig/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/Makefile.in 2005-03-18 16:04:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -114,9 +115,18 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/acinclude.m4 kdelibs-3.4.0/acinclude.m4
---- kdelibs-3.4.0.orig/acinclude.m4 2005-03-04 14:20:24.000000000 +0100
-+++ kdelibs-3.4.0/acinclude.m4 2005-03-04 20:39:05.844319701 +0100
+@@ -1294,7 +1309,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/acinclude.m4 kdelibs-3.4.0/acinclude.m4
+--- kdelibs-3.4.0.orig/acinclude.m4 2005-03-04 08:20:24.000000000 -0500
++++ kdelibs-3.4.0/acinclude.m4 2005-03-18 16:00:47.000000000 -0500
@@ -1682,15 +1682,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -143,7 +153,70 @@
AC_TRY_COMPILE([
$2
],
-@@ -5686,6 +5674,7 @@
+@@ -3194,6 +3182,51 @@
+ ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
+ ])
+
++AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
++ [
++ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
++ [
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
++
++ safe_CXXFLAGS=$CXXFLAGS
++ safe_LDFLAGS=$LDFLAGS
++ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
++ LDFLAGS="$LDFLAGS -shared -fPIC"
++
++ AC_TRY_LINK(
++ [
++ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
++ template<typename CharT>
++ struct VisTest
++ {
++ inline VisTest ();
++ };
++ template<typename CharT>
++ inline VisTest<CharT>::VisTest()
++ {}
++ extern template class VisTest<char>; // It works if we drop that line
++ int some_function( int do_something ) __attribute__ ((visibility("default")));
++ int some_function( int )
++ {
++ VisTest<char> a;
++ return 0;
++ }
++ ], [/* elvis is alive */],
++ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
++
++ CXXFLAGS=$safe_CXXFLAGS
++ LDFLAGS=$safe_LDFLAGS
++ AC_LANG_RESTORE
++ ]
++ )
++
++ if test x$kde_cv_val_gcc_visibility_bug = xno; then
++ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
++ fi
++ ]
++)
++
+ AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
+ [
+ if test "$GXX" = "yes"; then
+@@ -3202,7 +3235,9 @@
+ KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
+ KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+ [
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
++ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++ KDE_CHECK_VISIBILITY_GCC_BUG
++
+ HAVE_GCC_VISIBILITY=1
+ AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+ ])
+@@ -5686,6 +5721,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -151,7 +224,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5734,7 @@
+@@ -5745,7 +5781,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -160,7 +233,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6148,11 @@
+@@ -6159,12 +6195,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -174,7 +247,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6176,7 +6211,6 @@
esac
;;
*64-bit*)
@@ -182,7 +255,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6293,7 @@
+@@ -6306,7 +6340,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -191,7 +264,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6335,20 +6369,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -223,7 +296,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 @@
+@@ -6498,7 +6538,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -232,7 +305,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6580,6 @@
+@@ -6587,13 +6627,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -246,7 +319,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 @@
+@@ -6617,8 +6650,11 @@
fi
fi
chmod u+w .
@@ -260,7 +333,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6735,7 +6771,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -269,7 +342,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6737,7 @@
+@@ -6748,7 +6784,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -278,7 +351,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6747,20 @@
+@@ -6758,7 +6794,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -300,7 +373,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6825,7 @@
+@@ -6823,7 +6872,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -309,7 +382,7 @@
;;
beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6848,7 +6897,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -318,7 +391,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6915,7 @@
+@@ -6913,7 +6962,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -327,7 +400,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 @@
+@@ -6936,7 +6985,7 @@
dynamic_linker=no
;;
@@ -336,7 +409,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +6998,7 @@
+@@ -6996,7 +7045,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -345,7 +418,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7013,7 @@
+@@ -7011,7 +7060,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -354,7 +427,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 @@
+@@ -7022,7 +7071,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -363,7 +436,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 @@
+@@ -7084,22 +7133,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'
@@ -392,7 +465,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 @@
+@@ -7109,6 +7155,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -423,7 +496,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7141,7 @@
+@@ -7118,7 +7188,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -432,7 +505,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7170,7 @@
+@@ -7147,7 +7217,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -441,7 +514,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 @@
+@@ -7167,7 +7237,7 @@
os2*)
libname_spec='$name'
@@ -450,7 +523,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7781,23 @@
+@@ -7758,31 +7828,23 @@
;;
cygwin*)
@@ -491,7 +564,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7836,21 @@
+@@ -7821,42 +7883,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -541,7 +614,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 @@
+@@ -7885,9 +7926,6 @@
;;
osf3* | osf4* | osf5*)
@@ -551,7 +624,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7888,6 @@
+@@ -7897,7 +7935,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -559,7 +632,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8153,7 @@
+@@ -8163,7 +8200,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])
@@ -568,7 +641,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 @@
+@@ -8213,7 +8250,7 @@
fi
;;
@@ -577,7 +650,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8213,29 @@
+@@ -8223,29 +8260,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -621,7 +694,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 @@
+@@ -8253,8 +8290,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -632,7 +705,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8352,8 @@
+@@ -8362,8 +8399,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
@@ -643,7 +716,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 @@
+@@ -8389,7 +8426,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.
@@ -652,7 +725,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8409,22 @@
+@@ -8419,8 +8456,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -677,7 +750,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8470,16 @@
+@@ -8466,15 +8517,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -698,7 +771,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 @@
+@@ -8483,13 +8535,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -714,7 +787,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8508,7 @@
+@@ -8504,7 +8555,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.
@@ -723,7 +796,7 @@
fi
fi
;;
-@@ -8521,12 +8525,12 @@
+@@ -8521,12 +8572,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'
@@ -738,7 +811,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 @@
+@@ -8535,7 +8586,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -747,7 +820,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8550,20 @@
+@@ -8546,20 +8597,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -778,7 +851,7 @@
fi
;;
esac
-@@ -8569,19 +8573,19 @@
+@@ -8569,19 +8620,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -804,7 +877,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 @@
+@@ -8616,7 +8667,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -813,7 +886,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 @@
+@@ -8638,7 +8689,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -822,7 +895,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 @@
+@@ -8647,11 +8698,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.
@@ -836,7 +909,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8712,7 @@
+@@ -8708,7 +8759,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -845,7 +918,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8733,7 @@
+@@ -8729,7 +8780,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -854,7 +927,7 @@
;;
esac
fi
-@@ -8744,7 +8748,7 @@
+@@ -8744,7 +8795,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -863,7 +936,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 @@
+@@ -8755,9 +8806,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -875,7 +948,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8778,8 @@
+@@ -8774,8 +8825,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.
@@ -886,7 +959,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 @@
+@@ -8797,16 +8848,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -907,7 +980,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8848,7 @@
+@@ -8844,7 +8895,7 @@
;;
esac
;;
@@ -916,7 +989,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 @@
+@@ -8863,7 +8914,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.
@@ -925,7 +998,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8884,7 @@
+@@ -8880,7 +8931,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -934,7 +1007,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8902,7 @@
+@@ -8898,7 +8949,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -943,7 +1016,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8927,7 @@
+@@ -8923,7 +8974,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.
@@ -952,7 +1025,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8943,10 @@
+@@ -8939,10 +8990,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -965,7 +1038,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +8965,7 @@
+@@ -8961,7 +9012,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -974,7 +1047,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9022,9 @@
+@@ -9018,9 +9069,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -986,7 +1059,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9058,7 @@
+@@ -9054,7 +9105,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -995,7 +1068,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 @@
+@@ -9064,9 +9115,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
@@ -1007,7 +1080,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9079,9 @@
+@@ -9075,9 +9126,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -1019,7 +1092,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9249,7 @@
+@@ -9245,7 +9296,7 @@
fi
;;
@@ -1028,7 +1101,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 @@
+@@ -9354,7 +9405,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1037,7 +1110,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9500,12 @@
+@@ -9496,11 +9547,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1052,7 +1125,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 @@
+@@ -9550,7 +9602,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1061,7 +1134,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 @@
+@@ -9681,7 +9733,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1070,7 +1143,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9717,7 @@
+@@ -9712,7 +9764,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1079,7 +1152,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +9961,10 @@
+@@ -9956,7 +10008,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.
@@ -1091,7 +1164,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10037,7 @@
+@@ -10029,7 +10084,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1100,7 +1173,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10055,7 @@
+@@ -10047,7 +10102,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1109,7 +1182,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10262,7 +10317,7 @@
;;
esac
;;
@@ -1118,7 +1191,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10321,7 @@
+@@ -10313,7 +10368,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'
@@ -1127,7 +1200,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10346,7 @@
+@@ -10338,7 +10393,7 @@
;;
esac
;;
@@ -1136,7 +1209,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10657,9 @@
+@@ -10649,6 +10704,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'
;;
@@ -1146,7 +1219,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10684,7 @@
+@@ -10673,7 +10731,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1155,7 +1228,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 @@
+@@ -10747,7 +10805,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
@@ -1164,7 +1237,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10768,13 @@
+@@ -10757,13 +10815,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'
@@ -1180,7 +1253,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 @@
+@@ -10772,19 +10830,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1204,7 +1277,7 @@
fi
;;
-@@ -10802,8 +10813,8 @@
+@@ -10802,8 +10860,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1215,7 +1288,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10827,36 @@
+@@ -10816,10 +10874,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1254,7 +1327,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10906,20 @@
+@@ -10869,9 +10953,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
@@ -1277,7 +1350,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +10965,29 @@
+@@ -10917,29 +11012,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1316,7 +1389,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11002,7 @@
+@@ -10954,7 +11049,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.
@@ -1325,7 +1398,7 @@
fi
fi
;;
-@@ -10977,13 +11025,13 @@
+@@ -10977,13 +11072,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1342,7 +1415,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 @@
+@@ -10997,21 +11092,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1377,7 +1450,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11068,26 @@
+@@ -11020,26 +11115,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1412,7 +1485,7 @@
;;
dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11072,8 +11167,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1423,7 +1496,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 @@
+@@ -11081,7 +11176,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1432,7 +1505,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 @@
+@@ -11099,10 +11194,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1445,7 +1518,7 @@
;;
esac
else
-@@ -11149,7 +11197,7 @@
+@@ -11149,7 +11244,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1454,7 +1527,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 @@
+@@ -11159,7 +11254,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1463,7 +1536,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 @@
+@@ -11182,7 +11277,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
@@ -1472,7 +1545,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 @@
+@@ -11192,7 +11287,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1481,7 +1554,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11251,14 @@
+@@ -11203,14 +11298,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
@@ -1498,7 +1571,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 @@
+@@ -11222,7 +11317,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}\*'
@@ -1507,7 +1580,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 @@
+@@ -11247,9 +11342,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1519,7 +1592,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 @@
+@@ -11269,7 +11364,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.
@@ -1528,7 +1601,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11377,9 @@
+@@ -11329,9 +11424,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1540,7 +1613,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11437,7 @@
+@@ -11389,7 +11484,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1549,7 +1622,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11596,8 @@
+@@ -11548,8 +11643,8 @@
fi
done
done
@@ -1559,13 +1632,606 @@
AC_MSG_RESULT([$SED])
])
-diff -u -x debian -Nru kdelibs-3.4.0.orig/arts/Makefile.in kdelibs-3.4.0/arts/Makefile.in
---- kdelibs-3.4.0.orig/arts/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/arts/Makefile.in 2005-03-04 20:41:26.666280355 +0100
+diff -Nrua kdelibs-3.4.0.orig/aclocal.m4 kdelibs-3.4.0/aclocal.m4
+--- kdelibs-3.4.0.orig/aclocal.m4 2005-03-04 08:20:52.000000000 -0500
++++ kdelibs-3.4.0/aclocal.m4 2005-03-18 16:01:21.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 @@
+ 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
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ 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
+
+ # 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 kdelibs-3.4.0.orig/arts/Makefile.in kdelibs-3.4.0/arts/Makefile.in
+--- kdelibs-3.4.0.orig/arts/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/arts/Makefile.in 2005-03-18 16:04:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -1662,13 +2328,23 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/arts/kde/Makefile.in kdelibs-3.4.0/arts/kde/Makefile.in
---- kdelibs-3.4.0.orig/arts/kde/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/arts/kde/Makefile.in 2005-03-04 20:41:26.723270625 +0100
+@@ -996,7 +1011,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/arts/kde/Makefile.in kdelibs-3.4.0/arts/kde/Makefile.in
+--- kdelibs-3.4.0.orig/arts/kde/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/arts/kde/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -1858,13 +2534,14 @@
@echo 'creating libartskde_la.all_cpp.cpp ...'; \
rm -f libartskde_la.all_cpp.files libartskde_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/arts/kde/mcop-dcop/Makefile.in kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in
---- kdelibs-3.4.0.orig/arts/kde/mcop-dcop/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in 2005-03-04 20:41:26.751265846 +0100
+diff -Nrua kdelibs-3.4.0.orig/arts/kde/mcop-dcop/Makefile.in kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in
+--- kdelibs-3.4.0.orig/arts/kde/mcop-dcop/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/arts/kde/mcop-dcop/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -1927,13 +2604,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/arts/knotify/Makefile.in kdelibs-3.4.0/arts/knotify/Makefile.in
---- kdelibs-3.4.0.orig/arts/knotify/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/arts/knotify/Makefile.in 2005-03-04 20:41:26.781260725 +0100
+diff -Nrua kdelibs-3.4.0.orig/arts/knotify/Makefile.in kdelibs-3.4.0/arts/knotify/Makefile.in
+--- kdelibs-3.4.0.orig/arts/knotify/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/arts/knotify/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -1996,13 +2674,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/arts/message/Makefile.in kdelibs-3.4.0/arts/message/Makefile.in
---- kdelibs-3.4.0.orig/arts/message/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/arts/message/Makefile.in 2005-03-04 20:41:26.792258847 +0100
+diff -Nrua kdelibs-3.4.0.orig/arts/message/Makefile.in kdelibs-3.4.0/arts/message/Makefile.in
+--- kdelibs-3.4.0.orig/arts/message/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/arts/message/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2065,9 +2744,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/configure kdelibs-3.4.0/configure
---- kdelibs-3.4.0.orig/configure 2005-03-04 14:23:41.000000000 +0100
-+++ kdelibs-3.4.0/configure 2005-03-04 20:42:06.061554480 +0100
+diff -Nrua kdelibs-3.4.0.orig/configure kdelibs-3.4.0/configure
+--- kdelibs-3.4.0.orig/configure 2005-03-04 08:23:41.000000000 -0500
++++ kdelibs-3.4.0/configure 2005-03-18 16:05:39.000000000 -0500
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -2437,31 +3116,46 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6503,185 +6499,6 @@
+@@ -6503,92 +6499,39 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
- case $host in
- *-*-linux-gnu)
--
++ fi
+
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
--
--
--
+
+
+
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
+
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
++ # Check whether --enable-nmcheck or --disable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++ enableval="$enable_nmcheck"
++ kde_use_nmcheck=$enableval
++else
++ kde_use_nmcheck=no
++fi;
+
++ if test "$kde_use_nmcheck" = "yes"; then
++ KDE_USE_NMCHECK_TRUE=""
++ KDE_USE_NMCHECK_FALSE="#"
++ else
++ KDE_USE_NMCHECK_TRUE="#"
++ KDE_USE_NMCHECK_FALSE=""
++ fi
+
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -2470,7 +3164,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--
+
-int
-main ()
-{
@@ -2505,7 +3199,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
@@ -2515,115 +3209,116 @@
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
+
+
-fi
--
+
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
--
+
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
++ if test "$GXX" = "yes"; then
++
++echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
++kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
+ if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -6605,7 +6548,7 @@
+
+
+ save_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
++ CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -6630,8 +6573,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=$?
+@@ -6665,56 +6607,18 @@
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ :
+- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
++ CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ :
+- KDE_NO_UNDEFINED=""
+-fi
+
-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
+- KDE_NO_UNDEFINED=""
+ fi
+
+- ;;
+- esac
+- fi
-
-
-
-- ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
+- # Check whether --enable-nmcheck or --disable-nmcheck was given.
+-if test "${enable_nmcheck+set}" = set; then
+- enableval="$enable_nmcheck"
+- kde_use_nmcheck=$enableval
+-else
+- kde_use_nmcheck=no
+-fi;
-
-- save_CXXFLAGS="$CXXFLAGS"
-- CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
+- if test "$kde_use_nmcheck" = "yes"; then
+- KDE_USE_NMCHECK_TRUE=""
+- KDE_USE_NMCHECK_FALSE="#"
+- else
+- KDE_USE_NMCHECK_TRUE="#"
+- KDE_USE_NMCHECK_FALSE=""
+- fi
-
--int
--main ()
--{
-- return 0;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- eval "kde_cv_prog_cxx_$kde_cache=yes"
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+
-
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- CXXFLAGS="$save_CXXFLAGS"
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--fi
-
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- :
-- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- :
-- KDE_NO_UNDEFINED=""
--fi
-
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- :
-- KDE_NO_UNDEFINED=""
--fi
+- if test "$GXX" = "yes"; then
-
-- ;;
-- esac
- fi
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
+-kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
++echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
++kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
+ if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -6731,7 +6635,7 @@
-@@ -6756,8 +6573,7 @@
+ save_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -fno-exceptions"
++ CXXFLAGS="$CXXFLAGS -fno-check-new"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -6756,8 +6660,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2633,7 +3328,38 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6844,8 +6660,7 @@
+@@ -6791,7 +6694,7 @@
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ :
+- CXXFLAGS="$CXXFLAGS -fno-exceptions"
++ CXXFLAGS="$CXXFLAGS -fno-check-new"
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+@@ -6800,9 +6703,9 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
+-kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
++echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
++echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
++kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
+ if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -6819,7 +6722,7 @@
+
+
+ save_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -fno-check-new"
++ CXXFLAGS="$CXXFLAGS -fno-common"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -6844,8 +6747,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2643,7 +3369,38 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6932,8 +6747,7 @@
+@@ -6879,7 +6781,7 @@
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ :
+- CXXFLAGS="$CXXFLAGS -fno-check-new"
++ CXXFLAGS="$CXXFLAGS -fno-common"
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+@@ -6888,9 +6790,9 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
+-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
+-kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
++echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
++echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
++kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+ if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -6907,7 +6809,7 @@
+
+
+ save_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -fno-common"
++ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -6932,8 +6834,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2653,7 +3410,83 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7020,8 +6834,7 @@
+@@ -6967,25 +6868,18 @@
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ :
+- CXXFLAGS="$CXXFLAGS -fno-common"
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
+
+-fi
++ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+
+-
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
+-kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
++ echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
++echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
++if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+
+
+- ac_ext=cc
++ ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -6994,19 +6888,40 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+
+
+- save_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+- cat >conftest.$ac_ext <<_ACEOF
++
++ safe_CXXFLAGS=$CXXFLAGS
++ safe_LDFLAGS=$LDFLAGS
++ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
++ LDFLAGS="$LDFLAGS -shared -fPIC"
++
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
++ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
++ template<typename CharT>
++ struct VisTest
++ {
++ inline VisTest ();
++ };
++ template<typename CharT>
++ inline VisTest<CharT>::VisTest()
++ {}
++ extern template class VisTest<char>; // It works if we drop that line
++ int some_function( int do_something ) __attribute__ ((visibility("default")));
++ int some_function( int )
++ {
++ VisTest<char> a;
++ return 0;
++ }
++
+ int
+ main ()
+ {
+- return 0;
++/* elvis is alive */
+ ;
+ return 0;
+ }
+@@ -7020,8 +6935,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2663,7 +3496,52 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7250,10 +7063,10 @@
+@@ -7033,30 +6947,36 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- eval "kde_cv_prog_cxx_$kde_cache=yes"
++ kde_cv_val_gcc_visibility_bug=no
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++kde_cv_val_gcc_visibility_bug=yes
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- CXXFLAGS="$save_CXXFLAGS"
+- ac_ext=c
++
++ CXXFLAGS=$safe_CXXFLAGS
++ LDFLAGS=$safe_LDFLAGS
++ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
++
+ fi
++echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
++echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
++
++ if test x$kde_cv_val_gcc_visibility_bug = xno; then
++ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
++ fi
++
+
+-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- :
+
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
+ HAVE_GCC_VISIBILITY=1
+
+ cat >>confdefs.h <<_ACEOF
+@@ -7250,10 +7170,10 @@
fi
done
done
@@ -2675,7 +3553,7 @@
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
-@@ -7487,31 +7300,23 @@
+@@ -7487,31 +7407,23 @@
;;
cygwin*)
@@ -2715,7 +3593,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7550,42 +7355,21 @@
+@@ -7550,42 +7462,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -2765,7 +3643,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
-@@ -7614,9 +7398,6 @@
+@@ -7614,9 +7505,6 @@
;;
osf3* | osf4* | osf5*)
@@ -2775,7 +3653,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7626,7 +7407,6 @@
+@@ -7626,7 +7514,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -2783,16 +3661,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7703,7 +7483,7 @@
+@@ -7703,7 +7590,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7706 "configure"' > conftest.$ac_ext
-+ echo '#line 7486 "configure"' > conftest.$ac_ext
++ echo '#line 7593 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7748,12 +7528,11 @@
+@@ -7748,12 +7635,11 @@
(exit $ac_status); }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -2806,7 +3684,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7765,7 +7544,6 @@
+@@ -7765,7 +7651,6 @@
esac
;;
*64-bit*)
@@ -2814,7 +3692,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7825,8 +7603,7 @@
+@@ -7825,8 +7710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2824,7 +3702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7901,8 +7678,7 @@
+@@ -7901,8 +7785,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2834,7 +3712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8072,8 +7848,7 @@
+@@ -8072,8 +7955,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2844,7 +3722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8140,8 +7915,7 @@
+@@ -8140,8 +8022,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2854,16 +3732,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8348,7 +8122,7 @@
+@@ -8348,7 +8229,7 @@
# Provide some information about the compiler.
-echo "$as_me:8351:" \
-+echo "$as_me:8125:" \
++echo "$as_me:8232:" \
"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
-@@ -8394,8 +8168,7 @@
+@@ -8394,8 +8275,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2873,7 +3751,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8444,8 +8217,7 @@
+@@ -8444,8 +8324,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -2883,7 +3761,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8503,7 +8275,7 @@
+@@ -8503,7 +8382,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -2892,7 +3770,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8532,20 +8304,26 @@
+@@ -8532,20 +8411,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -2924,7 +3802,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.
-@@ -8613,7 +8391,7 @@
+@@ -8613,7 +8498,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -2933,7 +3811,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8631,7 +8409,7 @@
+@@ -8631,7 +8516,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2942,35 +3820,35 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9380,11 +9158,11 @@
+@@ -9380,11 +9265,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9383: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9161: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9268: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9387: \$? = $ac_status" >&5
-+ echo "$as_me:9165: \$? = $ac_status" >&5
++ echo "$as_me:9272: \$? = $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
-@@ -9613,11 +9391,11 @@
+@@ -9613,11 +9498,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9616: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9394: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9501: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9620: \$? = $ac_status" >&5
-+ echo "$as_me:9398: \$? = $ac_status" >&5
++ echo "$as_me:9505: \$? = $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
-@@ -9664,13 +9442,6 @@
+@@ -9664,13 +9549,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2984,21 +3862,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.
-@@ -9680,11 +9451,11 @@
+@@ -9680,11 +9558,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9683: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9454: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9561: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9687: \$? = $ac_status" >&5
-+ echo "$as_me:9458: \$? = $ac_status" >&5
++ echo "$as_me:9565: \$? = $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
-@@ -9694,8 +9465,11 @@
+@@ -9694,8 +9572,11 @@
fi
fi
chmod u+w .
@@ -3012,7 +3890,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9823,7 +9597,7 @@
+@@ -9823,7 +9704,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -3021,7 +3899,7 @@
else
ld_shlibs=no
fi
-@@ -9833,13 +9607,13 @@
+@@ -9833,13 +9714,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'
@@ -3037,7 +3915,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
-@@ -9848,19 +9622,19 @@
+@@ -9848,19 +9729,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3061,7 +3939,7 @@
fi
;;
-@@ -9878,8 +9652,8 @@
+@@ -9878,8 +9759,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3072,7 +3950,7 @@
else
ld_shlibs=no
fi
-@@ -9892,10 +9666,36 @@
+@@ -9892,10 +9773,36 @@
hardcode_shlibpath_var=no
;;
@@ -3111,7 +3989,7 @@
else
ld_shlibs=no
fi
-@@ -9945,9 +9745,20 @@
+@@ -9945,9 +9852,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
@@ -3134,7 +4012,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9993,21 +9804,22 @@
+@@ -9993,21 +9911,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3162,7 +4040,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10031,8 +9843,7 @@
+@@ -10031,8 +9950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3172,7 +4050,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -10059,14 +9870,13 @@
+@@ -10059,14 +9977,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -3190,7 +4068,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10093,8 +9903,7 @@
+@@ -10093,8 +10010,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3200,7 +4078,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -10132,7 +9941,7 @@
+@@ -10132,7 +10048,7 @@
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -3209,7 +4087,7 @@
fi
fi
;;
-@@ -10155,13 +9964,13 @@
+@@ -10155,13 +10071,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -3226,7 +4104,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.
-@@ -10175,21 +9984,21 @@
+@@ -10175,21 +10091,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -3261,7 +4139,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -10198,18 +10007,18 @@
+@@ -10198,18 +10114,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -3286,7 +4164,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -10250,8 +10059,8 @@
+@@ -10250,8 +10166,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3297,7 +4175,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10259,7 +10068,7 @@
+@@ -10259,7 +10175,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3306,7 +4184,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
-@@ -10277,10 +10086,10 @@
+@@ -10277,10 +10193,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -3319,7 +4197,7 @@
;;
esac
else
-@@ -10327,7 +10136,7 @@
+@@ -10327,7 +10243,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3328,7 +4206,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'
-@@ -10337,7 +10146,7 @@
+@@ -10337,7 +10253,7 @@
link_all_deplibs=yes
;;
@@ -3337,7 +4215,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10360,7 +10169,7 @@
+@@ -10360,7 +10276,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
@@ -3346,7 +4224,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10370,7 +10179,7 @@
+@@ -10370,7 +10286,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -3355,7 +4233,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10381,14 +10190,14 @@
+@@ -10381,14 +10297,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -3372,7 +4250,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'
-@@ -10400,7 +10209,7 @@
+@@ -10400,7 +10316,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3381,7 +4259,7 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10425,9 +10234,9 @@
+@@ -10425,9 +10341,9 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -3393,7 +4271,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~
-@@ -10447,7 +10256,7 @@
+@@ -10447,7 +10363,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.
@@ -3402,7 +4280,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10507,9 +10316,9 @@
+@@ -10507,9 +10423,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -3414,7 +4292,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10615,7 +10424,7 @@
+@@ -10615,7 +10531,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -3423,7 +4301,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10625,7 +10434,20 @@
+@@ -10625,7 +10541,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3445,7 +4323,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10690,7 +10512,7 @@
+@@ -10690,7 +10619,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3454,7 +4332,7 @@
;;
beos*)
-@@ -10715,7 +10537,7 @@
+@@ -10715,7 +10644,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -3463,7 +4341,7 @@
need_version=no
need_lib_prefix=no
-@@ -10780,7 +10602,7 @@
+@@ -10780,7 +10709,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -3472,7 +4350,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"`
-@@ -10803,7 +10625,7 @@
+@@ -10803,7 +10732,7 @@
dynamic_linker=no
;;
@@ -3481,7 +4359,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10863,7 +10685,7 @@
+@@ -10863,7 +10792,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -3490,7 +4368,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10878,7 +10700,7 @@
+@@ -10878,7 +10807,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -3499,7 +4377,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10889,7 +10711,7 @@
+@@ -10889,7 +10818,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -3508,7 +4386,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10951,22 +10773,19 @@
+@@ -10951,22 +10880,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'
@@ -3537,7 +4415,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,
-@@ -10976,6 +10795,30 @@
+@@ -10976,6 +10902,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -3568,7 +4446,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10985,7 +10828,7 @@
+@@ -10985,7 +10935,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -3577,7 +4455,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11014,7 +10857,7 @@
+@@ -11014,7 +10964,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3586,7 +4464,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
-@@ -11034,7 +10877,7 @@
+@@ -11034,7 +10984,7 @@
os2*)
libname_spec='$name'
@@ -3595,7 +4473,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11263,8 +11106,7 @@
+@@ -11263,8 +11213,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3605,7 +4483,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11367,8 +11209,7 @@
+@@ -11367,8 +11316,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3615,7 +4493,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11433,8 +11274,7 @@
+@@ -11433,8 +11381,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3625,7 +4503,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11527,8 +11367,7 @@
+@@ -11527,8 +11474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3635,7 +4513,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11593,8 +11432,7 @@
+@@ -11593,8 +11539,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3645,7 +4523,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11660,8 +11498,7 @@
+@@ -11660,8 +11605,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3655,7 +4533,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11727,8 +11564,7 @@
+@@ -11727,8 +11671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3665,25 +4543,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11803,7 +11639,7 @@
+@@ -11803,7 +11746,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11806 "configure"
-+#line 11642 "configure"
++#line 11749 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11901,7 +11737,7 @@
+@@ -11901,7 +11844,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11904 "configure"
-+#line 11740 "configure"
++#line 11847 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12026,7 +11862,7 @@
+@@ -12026,7 +11969,7 @@
fi
;;
@@ -3692,7 +4570,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -12036,29 +11872,29 @@
+@@ -12036,29 +11979,29 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -3736,7 +4614,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -12092,7 +11928,8 @@
+@@ -12092,7 +12035,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.
@@ -3746,7 +4624,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 \
-@@ -12270,7 +12107,7 @@
+@@ -12270,7 +12214,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -3755,7 +4633,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12301,7 +12138,7 @@
+@@ -12301,7 +12245,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -3764,7 +4642,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12543,7 +12380,10 @@
+@@ -12543,7 +12487,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.
@@ -3776,7 +4654,7 @@
fi
-@@ -12811,8 +12651,8 @@
+@@ -12811,8 +12758,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
@@ -3787,7 +4665,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12838,7 +12678,7 @@
+@@ -12838,7 +12785,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.
@@ -3796,7 +4674,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12869,8 +12709,22 @@
+@@ -12869,8 +12816,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -3821,7 +4699,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12916,15 +12770,16 @@
+@@ -12916,15 +12877,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -3842,7 +4720,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.
-@@ -12954,8 +12809,7 @@
+@@ -12954,8 +12916,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3852,7 +4730,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12984,13 +12838,12 @@
+@@ -12984,13 +12945,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -3868,7 +4746,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -13017,8 +12870,7 @@
+@@ -13017,8 +12977,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3878,7 +4756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -13056,7 +12908,7 @@
+@@ -13056,7 +13015,7 @@
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -3887,7 +4765,7 @@
fi
fi
;;
-@@ -13073,12 +12925,12 @@
+@@ -13073,12 +13032,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'
@@ -3902,7 +4780,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
-@@ -13087,7 +12939,7 @@
+@@ -13087,7 +13046,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3911,7 +4789,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -13098,20 +12950,20 @@
+@@ -13098,20 +13057,20 @@
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -3942,7 +4820,7 @@
fi
;;
esac
-@@ -13121,19 +12973,19 @@
+@@ -13121,19 +13080,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -3968,7 +4846,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
-@@ -13168,7 +13020,7 @@
+@@ -13168,7 +13127,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -3977,7 +4855,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13190,7 +13042,7 @@
+@@ -13190,7 +13149,7 @@
ld_shlibs_CXX=no
;;
aCC)
@@ -3986,7 +4864,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13199,11 +13051,11 @@
+@@ -13199,11 +13158,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.
@@ -4000,7 +4878,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13260,7 +13112,7 @@
+@@ -13260,7 +13219,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -4009,7 +4887,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13281,7 +13133,7 @@
+@@ -13281,7 +13240,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -4018,7 +4896,7 @@
;;
esac
fi
-@@ -13296,7 +13148,7 @@
+@@ -13296,7 +13255,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -4027,7 +4905,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13307,9 +13159,9 @@
+@@ -13307,9 +13266,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -4039,7 +4917,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13326,8 +13178,8 @@
+@@ -13326,8 +13285,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.
@@ -4050,7 +4928,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13349,16 +13201,16 @@
+@@ -13349,16 +13308,16 @@
# Intel C++
with_gnu_ld=yes
archive_cmds_need_lc_CXX=no
@@ -4071,7 +4949,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13396,7 +13248,7 @@
+@@ -13396,7 +13355,7 @@
;;
esac
;;
@@ -4080,7 +4958,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=
-@@ -13415,7 +13267,7 @@
+@@ -13415,7 +13374,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.
@@ -4089,7 +4967,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13432,7 +13284,7 @@
+@@ -13432,7 +13391,7 @@
;;
cxx)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4098,7 +4976,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13450,7 +13302,7 @@
+@@ -13450,7 +13409,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4107,7 +4985,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13475,7 +13327,7 @@
+@@ -13475,7 +13434,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.
@@ -4116,7 +4994,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13491,10 +13343,10 @@
+@@ -13491,10 +13450,10 @@
;;
cxx)
allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -4129,7 +5007,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13513,7 +13365,7 @@
+@@ -13513,7 +13472,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4138,7 +5016,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13570,9 +13422,9 @@
+@@ -13570,9 +13529,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
no_undefined_flag_CXX=' -zdefs'
@@ -4150,7 +5028,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -13606,7 +13458,7 @@
+@@ -13606,7 +13565,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -4159,7 +5037,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13616,9 +13468,9 @@
+@@ -13616,9 +13575,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
@@ -4171,7 +5049,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13627,9 +13479,9 @@
+@@ -13627,9 +13586,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -4183,7 +5061,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13744,7 +13596,7 @@
+@@ -13744,7 +13703,7 @@
fi
;;
@@ -4192,7 +5070,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13879,7 +13731,7 @@
+@@ -13879,7 +13838,7 @@
;;
esac
;;
@@ -4201,7 +5079,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13955,7 +13807,7 @@
+@@ -13955,7 +13914,7 @@
;;
esac
;;
@@ -4210,21 +5088,21 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14066,11 +13918,11 @@
+@@ -14066,11 +14025,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14069: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13921: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14028: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14073: \$? = $ac_status" >&5
-+ echo "$as_me:13925: \$? = $ac_status" >&5
++ echo "$as_me:14032: \$? = $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
-@@ -14117,13 +13969,6 @@
+@@ -14117,13 +14076,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4238,21 +5116,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.
-@@ -14133,11 +13978,11 @@
+@@ -14133,11 +14085,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14136: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13981: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14088: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14140: \$? = $ac_status" >&5
-+ echo "$as_me:13985: \$? = $ac_status" >&5
++ echo "$as_me:14092: \$? = $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
-@@ -14147,8 +13992,11 @@
+@@ -14147,8 +14099,11 @@
fi
fi
chmod u+w .
@@ -4266,7 +5144,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14200,6 +14048,9 @@
+@@ -14200,6 +14155,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'
;;
@@ -4276,7 +5154,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14281,7 +14132,7 @@
+@@ -14281,7 +14239,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -4285,7 +5163,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14291,7 +14142,20 @@
+@@ -14291,7 +14249,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4307,7 +5185,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14356,7 +14220,7 @@
+@@ -14356,7 +14327,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4316,7 +5194,7 @@
;;
beos*)
-@@ -14381,7 +14245,7 @@
+@@ -14381,7 +14352,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -4325,7 +5203,7 @@
need_version=no
need_lib_prefix=no
-@@ -14446,7 +14310,7 @@
+@@ -14446,7 +14417,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -4334,7 +5212,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"`
-@@ -14469,7 +14333,7 @@
+@@ -14469,7 +14440,7 @@
dynamic_linker=no
;;
@@ -4343,7 +5221,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14529,7 +14393,7 @@
+@@ -14529,7 +14500,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -4352,7 +5230,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14544,7 +14408,7 @@
+@@ -14544,7 +14515,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -4361,7 +5239,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14555,7 +14419,7 @@
+@@ -14555,7 +14526,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -4370,7 +5248,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14617,22 +14481,19 @@
+@@ -14617,22 +14588,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'
@@ -4399,7 +5277,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,
-@@ -14642,6 +14503,30 @@
+@@ -14642,6 +14610,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4430,7 +5308,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14651,7 +14536,7 @@
+@@ -14651,7 +14643,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -4439,7 +5317,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14680,7 +14565,7 @@
+@@ -14680,7 +14672,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -4448,7 +5326,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
-@@ -14700,7 +14585,7 @@
+@@ -14700,7 +14692,7 @@
os2*)
libname_spec='$name'
@@ -4457,7 +5335,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14929,8 +14814,7 @@
+@@ -14929,8 +14921,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4467,7 +5345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15033,8 +14917,7 @@
+@@ -15033,8 +15024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4477,7 +5355,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15099,8 +14982,7 @@
+@@ -15099,8 +15089,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4487,7 +5365,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15193,8 +15075,7 @@
+@@ -15193,8 +15182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4497,7 +5375,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15259,8 +15140,7 @@
+@@ -15259,8 +15247,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4507,7 +5385,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15326,8 +15206,7 @@
+@@ -15326,8 +15313,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4517,7 +5395,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15393,8 +15272,7 @@
+@@ -15393,8 +15379,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4527,25 +5405,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15469,7 +15347,7 @@
+@@ -15469,7 +15454,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15472 "configure"
-+#line 15350 "configure"
++#line 15457 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15567,7 +15445,7 @@
+@@ -15567,7 +15552,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15570 "configure"
-+#line 15448 "configure"
++#line 15555 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15684,7 +15562,8 @@
+@@ -15684,7 +15669,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.
@@ -4555,7 +5433,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 \
-@@ -15814,7 +15693,7 @@
+@@ -15814,7 +15800,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -4564,7 +5442,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15845,7 +15724,7 @@
+@@ -15845,7 +15831,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -4573,7 +5451,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -16062,7 +15941,10 @@
+@@ -16062,7 +16048,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.
@@ -4585,7 +5463,7 @@
fi
-@@ -16164,7 +16046,7 @@
+@@ -16164,7 +16153,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -4594,21 +5472,21 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -16390,11 +16272,11 @@
+@@ -16390,11 +16379,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16393: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16275: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16382: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16397: \$? = $ac_status" >&5
-+ echo "$as_me:16279: \$? = $ac_status" >&5
++ echo "$as_me:16386: \$? = $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
-@@ -16441,13 +16323,6 @@
+@@ -16441,13 +16430,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4622,21 +5500,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.
-@@ -16457,11 +16332,11 @@
+@@ -16457,11 +16439,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16460: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16335: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16442: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16464: \$? = $ac_status" >&5
-+ echo "$as_me:16339: \$? = $ac_status" >&5
++ echo "$as_me:16446: \$? = $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
-@@ -16471,8 +16346,11 @@
+@@ -16471,8 +16453,11 @@
fi
fi
chmod u+w .
@@ -4650,7 +5528,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16600,7 +16478,7 @@
+@@ -16600,7 +16585,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4659,7 +5537,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16610,13 +16488,13 @@
+@@ -16610,13 +16595,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'
@@ -4675,7 +5553,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
-@@ -16625,19 +16503,19 @@
+@@ -16625,19 +16610,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4699,7 +5577,7 @@
fi
;;
-@@ -16655,8 +16533,8 @@
+@@ -16655,8 +16640,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4710,7 +5588,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16669,10 +16547,36 @@
+@@ -16669,10 +16654,36 @@
hardcode_shlibpath_var_F77=no
;;
@@ -4749,7 +5627,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16722,9 +16626,20 @@
+@@ -16722,9 +16733,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
@@ -4772,7 +5650,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16770,21 +16685,22 @@
+@@ -16770,21 +16792,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4800,7 +5678,7 @@
program main
end
-@@ -16798,8 +16714,7 @@
+@@ -16798,8 +16821,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4810,7 +5688,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16826,14 +16741,13 @@
+@@ -16826,14 +16848,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4828,7 +5706,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16850,8 +16764,7 @@
+@@ -16850,8 +16871,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4838,7 +5716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16889,7 +16802,7 @@
+@@ -16889,7 +16909,7 @@
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -4847,7 +5725,7 @@
fi
fi
;;
-@@ -16912,13 +16825,13 @@
+@@ -16912,13 +16932,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -4864,7 +5742,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.
-@@ -16932,21 +16845,21 @@
+@@ -16932,21 +16952,21 @@
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -4899,7 +5777,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -16955,18 +16868,18 @@
+@@ -16955,18 +16975,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -4924,7 +5802,7 @@
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -17007,8 +16920,8 @@
+@@ -17007,8 +17027,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4935,7 +5813,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17016,7 +16929,7 @@
+@@ -17016,7 +17036,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4944,7 +5822,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
-@@ -17034,10 +16947,10 @@
+@@ -17034,10 +17054,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -4957,7 +5835,7 @@
;;
esac
else
-@@ -17084,7 +16997,7 @@
+@@ -17084,7 +17104,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4966,7 +5844,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'
-@@ -17094,7 +17007,7 @@
+@@ -17094,7 +17114,7 @@
link_all_deplibs_F77=yes
;;
@@ -4975,7 +5853,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
-@@ -17117,7 +17030,7 @@
+@@ -17117,7 +17137,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
@@ -4984,7 +5862,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17127,7 +17040,7 @@
+@@ -17127,7 +17147,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -4993,7 +5871,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17138,14 +17051,14 @@
+@@ -17138,14 +17158,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -5010,7 +5888,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'
-@@ -17157,7 +17070,7 @@
+@@ -17157,7 +17177,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -5019,7 +5897,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -17182,9 +17095,9 @@
+@@ -17182,9 +17202,9 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -5031,7 +5909,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~
-@@ -17204,7 +17117,7 @@
+@@ -17204,7 +17224,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.
@@ -5040,7 +5918,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17264,9 +17177,9 @@
+@@ -17264,9 +17284,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5052,7 +5930,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17372,7 +17285,7 @@
+@@ -17372,7 +17392,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5061,7 +5939,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17382,7 +17295,20 @@
+@@ -17382,7 +17402,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5083,7 +5961,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17447,7 +17373,7 @@
+@@ -17447,7 +17480,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5092,7 +5970,7 @@
;;
beos*)
-@@ -17472,7 +17398,7 @@
+@@ -17472,7 +17505,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5101,7 +5979,7 @@
need_version=no
need_lib_prefix=no
-@@ -17537,7 +17463,7 @@
+@@ -17537,7 +17570,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5110,7 +5988,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"`
-@@ -17560,7 +17486,7 @@
+@@ -17560,7 +17593,7 @@
dynamic_linker=no
;;
@@ -5119,7 +5997,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17620,7 +17546,7 @@
+@@ -17620,7 +17653,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -5128,7 +6006,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17635,7 +17561,7 @@
+@@ -17635,7 +17668,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5137,7 +6015,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17646,7 +17572,7 @@
+@@ -17646,7 +17679,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5146,7 +6024,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17708,22 +17634,19 @@
+@@ -17708,22 +17741,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'
@@ -5175,7 +6053,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,
-@@ -17733,6 +17656,30 @@
+@@ -17733,6 +17763,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5206,7 +6084,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17742,7 +17689,7 @@
+@@ -17742,7 +17796,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5215,7 +6093,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17771,7 +17718,7 @@
+@@ -17771,7 +17825,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5224,7 +6102,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
-@@ -17791,7 +17738,7 @@
+@@ -17791,7 +17845,7 @@
os2*)
libname_spec='$name'
@@ -5233,7 +6111,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17970,7 +17917,8 @@
+@@ -17970,7 +18024,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.
@@ -5243,7 +6121,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 \
-@@ -18100,7 +18048,7 @@
+@@ -18100,7 +18155,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5252,7 +6130,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18131,7 +18079,7 @@
+@@ -18131,7 +18186,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5261,7 +6139,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18348,7 +18296,10 @@
+@@ -18348,7 +18403,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.
@@ -5273,35 +6151,35 @@
fi
-@@ -18430,11 +18381,11 @@
+@@ -18430,11 +18488,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18433: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18384: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18491: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18437: \$? = $ac_status" >&5
-+ echo "$as_me:18388: \$? = $ac_status" >&5
++ echo "$as_me:18495: \$? = $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
-@@ -18663,11 +18614,11 @@
+@@ -18663,11 +18721,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18666: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18617: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18724: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18670: \$? = $ac_status" >&5
-+ echo "$as_me:18621: \$? = $ac_status" >&5
++ echo "$as_me:18728: \$? = $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
-@@ -18714,13 +18665,6 @@
+@@ -18714,13 +18772,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -5315,21 +6193,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.
-@@ -18730,11 +18674,11 @@
+@@ -18730,11 +18781,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18733: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18677: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18784: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18737: \$? = $ac_status" >&5
-+ echo "$as_me:18681: \$? = $ac_status" >&5
++ echo "$as_me:18788: \$? = $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
-@@ -18744,8 +18688,11 @@
+@@ -18744,8 +18795,11 @@
fi
fi
chmod u+w .
@@ -5343,7 +6221,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18873,7 +18820,7 @@
+@@ -18873,7 +18927,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -5352,7 +6230,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18883,13 +18830,13 @@
+@@ -18883,13 +18937,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'
@@ -5368,7 +6246,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
-@@ -18898,19 +18845,19 @@
+@@ -18898,19 +18952,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5392,7 +6270,7 @@
fi
;;
-@@ -18928,8 +18875,8 @@
+@@ -18928,8 +18982,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5403,7 +6281,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18942,10 +18889,36 @@
+@@ -18942,10 +18996,36 @@
hardcode_shlibpath_var_GCJ=no
;;
@@ -5442,7 +6320,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18995,9 +18968,20 @@
+@@ -18995,9 +19075,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
@@ -5465,7 +6343,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19043,21 +19027,22 @@
+@@ -19043,21 +19134,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5493,7 +6371,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19081,8 +19066,7 @@
+@@ -19081,8 +19173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5503,7 +6381,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -19109,14 +19093,13 @@
+@@ -19109,14 +19200,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5521,7 +6399,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19143,8 +19126,7 @@
+@@ -19143,8 +19233,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5531,7 +6409,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -19182,7 +19164,7 @@
+@@ -19182,7 +19271,7 @@
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -5540,7 +6418,7 @@
fi
fi
;;
-@@ -19205,13 +19187,13 @@
+@@ -19205,13 +19294,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -5557,7 +6435,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.
-@@ -19225,21 +19207,21 @@
+@@ -19225,21 +19314,21 @@
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -5592,7 +6470,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -19248,18 +19230,18 @@
+@@ -19248,18 +19337,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5617,7 +6495,7 @@
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -19300,8 +19282,8 @@
+@@ -19300,8 +19389,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5628,7 +6506,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19309,7 +19291,7 @@
+@@ -19309,7 +19398,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5637,7 +6515,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
-@@ -19327,10 +19309,10 @@
+@@ -19327,10 +19416,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -5650,7 +6528,7 @@
;;
esac
else
-@@ -19377,7 +19359,7 @@
+@@ -19377,7 +19466,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5659,7 +6537,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'
-@@ -19387,7 +19369,7 @@
+@@ -19387,7 +19476,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5668,7 +6546,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
-@@ -19410,7 +19392,7 @@
+@@ -19410,7 +19499,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
@@ -5677,7 +6555,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19420,7 +19402,7 @@
+@@ -19420,7 +19509,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -5686,7 +6564,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19431,14 +19413,14 @@
+@@ -19431,14 +19520,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -5703,7 +6581,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'
-@@ -19450,7 +19432,7 @@
+@@ -19450,7 +19539,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5712,7 +6590,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19475,9 +19457,9 @@
+@@ -19475,9 +19564,9 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -5724,7 +6602,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~
-@@ -19497,7 +19479,7 @@
+@@ -19497,7 +19586,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.
@@ -5733,7 +6611,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19557,9 +19539,9 @@
+@@ -19557,9 +19646,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5745,7 +6623,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19665,7 +19647,7 @@
+@@ -19665,7 +19754,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5754,7 +6632,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19675,7 +19657,20 @@
+@@ -19675,7 +19764,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5776,7 +6654,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19740,7 +19735,7 @@
+@@ -19740,7 +19842,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5785,7 +6663,7 @@
;;
beos*)
-@@ -19765,7 +19760,7 @@
+@@ -19765,7 +19867,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5794,7 +6672,7 @@
need_version=no
need_lib_prefix=no
-@@ -19830,7 +19825,7 @@
+@@ -19830,7 +19932,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5803,7 +6681,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"`
-@@ -19853,7 +19848,7 @@
+@@ -19853,7 +19955,7 @@
dynamic_linker=no
;;
@@ -5812,7 +6690,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19913,7 +19908,7 @@
+@@ -19913,7 +20015,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -5821,7 +6699,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19928,7 +19923,7 @@
+@@ -19928,7 +20030,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5830,7 +6708,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19939,7 +19934,7 @@
+@@ -19939,7 +20041,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5839,7 +6717,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -20001,22 +19996,19 @@
+@@ -20001,22 +20103,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'
@@ -5868,7 +6746,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,
-@@ -20026,6 +20018,30 @@
+@@ -20026,6 +20125,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5899,7 +6777,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -20035,7 +20051,7 @@
+@@ -20035,7 +20158,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5908,7 +6786,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -20064,7 +20080,7 @@
+@@ -20064,7 +20187,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5917,7 +6795,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
-@@ -20084,7 +20100,7 @@
+@@ -20084,7 +20207,7 @@
os2*)
libname_spec='$name'
@@ -5926,7 +6804,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20313,8 +20329,7 @@
+@@ -20313,8 +20436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5936,7 +6814,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20417,8 +20432,7 @@
+@@ -20417,8 +20539,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5946,7 +6824,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20483,8 +20497,7 @@
+@@ -20483,8 +20604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5956,7 +6834,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20577,8 +20590,7 @@
+@@ -20577,8 +20697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5966,7 +6844,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20643,8 +20655,7 @@
+@@ -20643,8 +20762,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5976,7 +6854,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20710,8 +20721,7 @@
+@@ -20710,8 +20828,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5986,7 +6864,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20777,8 +20787,7 @@
+@@ -20777,8 +20894,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5996,25 +6874,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20853,7 +20862,7 @@
+@@ -20853,7 +20969,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20856 "configure"
-+#line 20865 "configure"
++#line 20972 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20951,7 +20960,7 @@
+@@ -20951,7 +21067,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20954 "configure"
-+#line 20963 "configure"
++#line 21070 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -21068,7 +21077,8 @@
+@@ -21068,7 +21184,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.
@@ -6024,7 +6902,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 \
-@@ -21198,7 +21208,7 @@
+@@ -21198,7 +21315,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6033,7 +6911,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21229,7 +21239,7 @@
+@@ -21229,7 +21346,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6042,7 +6920,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21446,7 +21456,10 @@
+@@ -21446,7 +21563,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.
@@ -6054,7 +6932,7 @@
fi
-@@ -21509,7 +21522,8 @@
+@@ -21509,7 +21629,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.
@@ -6064,7 +6942,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 \
-@@ -21639,7 +21653,7 @@
+@@ -21639,7 +21760,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6073,7 +6951,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21670,7 +21684,7 @@
+@@ -21670,7 +21791,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6082,7 +6960,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21887,7 +21901,10 @@
+@@ -21887,7 +22008,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.
@@ -6094,7 +6972,7 @@
fi
-@@ -21934,7 +21951,7 @@
+@@ -21934,7 +22058,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -6103,7 +6981,7 @@
# Prevent multiple expansion
-@@ -22371,8 +22388,7 @@
+@@ -22371,8 +22495,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6113,7 +6991,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22469,8 +22485,7 @@
+@@ -22469,8 +22592,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6123,7 +7001,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22539,8 +22554,7 @@
+@@ -22539,8 +22661,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6133,7 +7011,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22643,8 +22657,7 @@
+@@ -22643,8 +22764,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6143,7 +7021,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22713,8 +22726,7 @@
+@@ -22713,8 +22833,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6153,7 +7031,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22789,8 +22801,7 @@
+@@ -22789,8 +22908,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6163,7 +7041,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22897,8 +22908,7 @@
+@@ -22897,8 +23015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6173,7 +7051,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23169,8 +23179,7 @@
+@@ -23169,8 +23286,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6183,7 +7061,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23320,8 +23329,7 @@
+@@ -23320,8 +23436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6193,7 +7071,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23506,8 +23514,7 @@
+@@ -23506,8 +23621,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6203,7 +7081,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23609,8 +23616,7 @@
+@@ -23609,8 +23723,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6213,7 +7091,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23712,8 +23718,7 @@
+@@ -23712,8 +23825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6223,7 +7101,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23814,8 +23819,7 @@
+@@ -23814,8 +23926,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6233,7 +7111,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24106,8 +24110,7 @@
+@@ -24106,8 +24217,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6243,7 +7121,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24172,8 +24175,7 @@
+@@ -24172,8 +24282,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6253,7 +7131,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24237,8 +24239,7 @@
+@@ -24237,8 +24346,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6263,7 +7141,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24319,8 +24320,7 @@
+@@ -24319,8 +24427,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6273,7 +7151,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24461,8 +24461,7 @@
+@@ -24461,8 +24568,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6283,7 +7161,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24600,8 +24599,7 @@
+@@ -24600,8 +24706,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6293,7 +7171,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24785,8 +24783,7 @@
+@@ -24785,8 +24890,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6303,7 +7181,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25032,8 +25029,7 @@
+@@ -25032,8 +25136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6313,7 +7191,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25226,8 +25222,7 @@
+@@ -25226,8 +25329,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6323,7 +7201,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25308,8 +25303,7 @@
+@@ -25308,8 +25410,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6333,7 +7211,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25379,8 +25373,7 @@
+@@ -25379,8 +25480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6343,7 +7221,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25489,8 +25482,7 @@
+@@ -25489,8 +25589,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6353,7 +7231,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25582,8 +25574,7 @@
+@@ -25582,8 +25681,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6363,7 +7241,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25655,8 +25646,7 @@
+@@ -25655,8 +25753,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6373,7 +7251,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25710,8 +25700,7 @@
+@@ -25710,8 +25807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6383,7 +7261,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25782,8 +25771,7 @@
+@@ -25782,8 +25878,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6393,7 +7271,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25837,8 +25825,7 @@
+@@ -25837,8 +25932,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6403,7 +7281,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25905,8 +25892,7 @@
+@@ -25905,8 +25999,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6413,7 +7291,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26084,8 +26070,7 @@
+@@ -26084,8 +26177,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6423,7 +7301,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26231,9 +26216,6 @@
+@@ -26231,9 +26323,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6433,7 +7311,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26267,8 +26249,7 @@
+@@ -26267,8 +26356,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6443,7 +7321,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26372,8 +26353,7 @@
+@@ -26372,8 +26460,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6453,7 +7331,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26452,9 +26432,6 @@
+@@ -26452,9 +26539,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6463,7 +7341,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26487,8 +26464,7 @@
+@@ -26487,8 +26571,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6473,7 +7351,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26591,8 +26567,7 @@
+@@ -26591,8 +26674,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6483,7 +7361,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26682,8 +26657,7 @@
+@@ -26682,8 +26764,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6493,7 +7371,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26744,8 +26718,7 @@
+@@ -26744,8 +26825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6503,7 +7381,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26813,8 +26786,7 @@
+@@ -26813,8 +26893,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6513,7 +7391,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26880,8 +26852,7 @@
+@@ -26880,8 +26959,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6523,7 +7401,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26974,8 +26945,7 @@
+@@ -26974,8 +27052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6533,7 +7411,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27053,8 +27023,7 @@
+@@ -27053,8 +27130,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6543,7 +7421,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27138,8 +27107,7 @@
+@@ -27138,8 +27214,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6553,7 +7431,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27207,8 +27175,7 @@
+@@ -27207,8 +27282,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6563,7 +7441,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27303,8 +27270,7 @@
+@@ -27303,8 +27377,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6573,7 +7451,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27368,8 +27334,7 @@
+@@ -27368,8 +27441,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6583,7 +7461,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27464,8 +27429,7 @@
+@@ -27464,8 +27536,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6593,7 +7471,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27529,8 +27493,7 @@
+@@ -27529,8 +27600,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6603,7 +7481,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27626,8 +27589,7 @@
+@@ -27626,8 +27696,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6613,7 +7491,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27691,8 +27653,7 @@
+@@ -27691,8 +27760,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6623,7 +7501,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27789,8 +27750,7 @@
+@@ -27789,8 +27857,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6633,7 +7511,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27855,8 +27815,7 @@
+@@ -27855,8 +27922,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6643,7 +7521,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27924,8 +27883,7 @@
+@@ -27924,8 +27990,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6653,7 +7531,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28076,8 +28034,7 @@
+@@ -28076,8 +28141,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6663,7 +7541,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28232,8 +28189,7 @@
+@@ -28232,8 +28296,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6673,7 +7551,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28298,8 +28254,7 @@
+@@ -28298,8 +28361,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6683,7 +7561,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28446,8 +28401,7 @@
+@@ -28446,8 +28508,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6693,7 +7571,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28602,8 +28556,7 @@
+@@ -28602,8 +28663,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6703,7 +7581,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28659,9 +28612,6 @@
+@@ -28659,9 +28719,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6713,7 +7591,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28695,8 +28645,7 @@
+@@ -28695,8 +28752,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6723,7 +7601,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28800,8 +28749,7 @@
+@@ -28800,8 +28856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6733,7 +7611,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28901,8 +28849,7 @@
+@@ -28901,8 +28956,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6743,7 +7621,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28976,8 +28923,7 @@
+@@ -28976,8 +29030,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6753,7 +7631,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29040,8 +28986,7 @@
+@@ -29040,8 +29093,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6763,7 +7641,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29103,8 +29048,7 @@
+@@ -29103,8 +29155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6773,7 +7651,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29144,8 +29088,7 @@
+@@ -29144,8 +29195,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6783,7 +7661,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29201,8 +29144,7 @@
+@@ -29201,8 +29251,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6793,7 +7671,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29242,8 +29184,7 @@
+@@ -29242,8 +29291,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6803,7 +7681,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29307,8 +29248,7 @@
+@@ -29307,8 +29355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6813,7 +7691,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29339,10 +29279,8 @@
+@@ -29339,10 +29386,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6826,7 +7704,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -29453,8 +29391,7 @@
+@@ -29453,8 +29498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6836,7 +7714,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29516,8 +29453,7 @@
+@@ -29516,8 +29560,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6846,7 +7724,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29557,8 +29493,7 @@
+@@ -29557,8 +29600,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6856,7 +7734,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29614,8 +29549,7 @@
+@@ -29614,8 +29656,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6866,7 +7744,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29655,8 +29589,7 @@
+@@ -29655,8 +29696,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6876,7 +7754,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29720,8 +29653,7 @@
+@@ -29720,8 +29760,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6886,7 +7764,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29752,10 +29684,8 @@
+@@ -29752,10 +29791,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6899,7 +7777,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -29866,8 +29796,7 @@
+@@ -29866,8 +29903,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6909,7 +7787,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29929,8 +29858,7 @@
+@@ -29929,8 +29965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6919,7 +7797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29970,8 +29898,7 @@
+@@ -29970,8 +30005,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6929,7 +7807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30027,8 +29954,7 @@
+@@ -30027,8 +30061,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6939,7 +7817,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30068,8 +29994,7 @@
+@@ -30068,8 +30101,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6949,7 +7827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30133,8 +30058,7 @@
+@@ -30133,8 +30165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6959,7 +7837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30165,10 +30089,8 @@
+@@ -30165,10 +30196,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -6972,7 +7850,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30279,8 +30201,7 @@
+@@ -30279,8 +30308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6982,7 +7860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30342,8 +30263,7 @@
+@@ -30342,8 +30370,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6992,7 +7870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30383,8 +30303,7 @@
+@@ -30383,8 +30410,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7002,7 +7880,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30440,8 +30359,7 @@
+@@ -30440,8 +30466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7012,7 +7890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30481,8 +30399,7 @@
+@@ -30481,8 +30506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7022,7 +7900,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30546,8 +30463,7 @@
+@@ -30546,8 +30570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7032,7 +7910,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30578,10 +30494,8 @@
+@@ -30578,10 +30601,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7045,7 +7923,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30700,8 +30614,7 @@
+@@ -30700,8 +30721,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7055,7 +7933,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30772,8 +30685,7 @@
+@@ -30772,8 +30792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7065,7 +7943,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30843,8 +30755,7 @@
+@@ -30843,8 +30862,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7075,7 +7953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30906,8 +30817,7 @@
+@@ -30906,8 +30924,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7085,7 +7963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30947,8 +30857,7 @@
+@@ -30947,8 +30964,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7095,7 +7973,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31004,8 +30913,7 @@
+@@ -31004,8 +31020,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7105,7 +7983,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31045,8 +30953,7 @@
+@@ -31045,8 +31060,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7115,7 +7993,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31110,8 +31017,7 @@
+@@ -31110,8 +31124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7125,7 +8003,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31142,10 +31048,8 @@
+@@ -31142,10 +31155,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7138,7 +8016,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -31257,8 +31161,7 @@
+@@ -31257,8 +31268,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7148,7 +8026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31320,8 +31223,7 @@
+@@ -31320,8 +31330,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7158,7 +8036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31361,8 +31263,7 @@
+@@ -31361,8 +31370,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7168,7 +8046,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31418,8 +31319,7 @@
+@@ -31418,8 +31426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7178,7 +8056,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31459,8 +31359,7 @@
+@@ -31459,8 +31466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7188,7 +8066,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31524,8 +31423,7 @@
+@@ -31524,8 +31530,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7198,7 +8076,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31556,10 +31454,8 @@
+@@ -31556,10 +31561,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -7211,7 +8089,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -31670,8 +31566,7 @@
+@@ -31670,8 +31673,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7221,7 +8099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31741,8 +31636,7 @@
+@@ -31741,8 +31743,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7231,7 +8109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31922,8 +31816,7 @@
+@@ -31922,8 +31923,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7241,7 +8119,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32032,8 +31925,7 @@
+@@ -32032,8 +32032,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7251,7 +8129,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32257,8 +32149,7 @@
+@@ -32257,8 +32256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7261,7 +8139,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32481,8 +32372,7 @@
+@@ -32481,8 +32479,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7271,7 +8149,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32558,8 +32448,7 @@
+@@ -32558,8 +32555,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7281,7 +8159,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32782,8 +32671,7 @@
+@@ -32782,8 +32778,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7291,7 +8169,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32858,8 +32746,7 @@
+@@ -32858,8 +32853,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7301,7 +8179,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32919,8 +32806,7 @@
+@@ -32919,8 +32913,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7311,7 +8189,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33003,8 +32889,7 @@
+@@ -33003,8 +32996,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7321,7 +8199,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33097,8 +32982,7 @@
+@@ -33097,8 +33089,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7331,7 +8209,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33272,8 +33156,7 @@
+@@ -33272,8 +33263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7341,7 +8219,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33371,8 +33254,7 @@
+@@ -33371,8 +33361,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7351,7 +8229,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33465,8 +33347,7 @@
+@@ -33465,8 +33454,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7361,7 +8239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33549,8 +33430,7 @@
+@@ -33549,8 +33537,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7371,25 +8249,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33603,7 +33483,7 @@
+@@ -33603,7 +33590,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 33606: $i/$j" >&5
-+ echo "configure: 33486: $i/$j" >&5
++ echo "configure: 33593: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -33911,7 +33791,7 @@
+@@ -33911,7 +33898,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 33914: $i/$j" >&5
-+ echo "configure: 33794: $i/$j" >&5
++ echo "configure: 33901: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -34588,8 +34468,7 @@
+@@ -34588,8 +34575,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7399,43 +8277,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34747,7 +34626,7 @@
+@@ -34747,7 +34733,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 34750: $i/$j" >&5
-+ echo "configure: 34629: $i/$j" >&5
++ echo "configure: 34736: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -34777,7 +34656,7 @@
+@@ -34777,7 +34763,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 34780: $i/$j" >&5
-+ echo "configure: 34659: $i/$j" >&5
++ echo "configure: 34766: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -34795,7 +34674,7 @@
+@@ -34795,7 +34781,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 34798: $i/$j" >&5
-+ echo "configure: 34677: $i/$j" >&5
++ echo "configure: 34784: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -36277,7 +36156,7 @@
+@@ -36277,7 +36263,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 36280: $i/$j" >&5
-+ echo "configure: 36159: $i/$j" >&5
++ echo "configure: 36266: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -36506,8 +36385,7 @@
+@@ -36506,8 +36492,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7445,7 +8323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36591,8 +36469,7 @@
+@@ -36591,8 +36576,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7455,7 +8333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36685,8 +36562,7 @@
+@@ -36685,8 +36669,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7465,7 +8343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36853,8 +36729,7 @@
+@@ -36853,8 +36836,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7475,7 +8353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37009,8 +36884,7 @@
+@@ -37009,8 +36991,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7485,7 +8363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37085,8 +36959,7 @@
+@@ -37085,8 +37066,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7495,7 +8373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37128,8 +37001,7 @@
+@@ -37128,8 +37108,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7505,7 +8383,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37186,8 +37058,7 @@
+@@ -37186,8 +37165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7515,7 +8393,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37317,9 +37188,6 @@
+@@ -37317,9 +37295,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7525,7 +8403,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37350,8 +37218,7 @@
+@@ -37350,8 +37325,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7535,7 +8413,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37452,8 +37319,7 @@
+@@ -37452,8 +37426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7545,7 +8423,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37532,9 +37398,6 @@
+@@ -37532,9 +37505,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7555,7 +8433,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37565,8 +37428,7 @@
+@@ -37565,8 +37535,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7565,7 +8443,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37667,8 +37529,7 @@
+@@ -37667,8 +37636,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7575,7 +8453,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37747,9 +37608,6 @@
+@@ -37747,9 +37715,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7585,7 +8463,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37782,8 +37640,7 @@
+@@ -37782,8 +37747,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7595,7 +8473,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37886,8 +37743,7 @@
+@@ -37886,8 +37850,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7605,7 +8483,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37965,9 +37821,6 @@
+@@ -37965,9 +37928,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7615,7 +8493,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38000,8 +37853,7 @@
+@@ -38000,8 +37960,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7625,7 +8503,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38104,8 +37956,7 @@
+@@ -38104,8 +38063,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7635,7 +8513,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38185,9 +38036,6 @@
+@@ -38185,9 +38143,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7645,7 +8523,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38221,8 +38069,7 @@
+@@ -38221,8 +38176,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7655,7 +8533,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38326,8 +38173,7 @@
+@@ -38326,8 +38280,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7665,7 +8543,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38406,9 +38252,6 @@
+@@ -38406,9 +38359,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7675,7 +8553,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38442,8 +38285,7 @@
+@@ -38442,8 +38392,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7685,7 +8563,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38547,8 +38389,7 @@
+@@ -38547,8 +38496,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7695,7 +8573,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38627,9 +38468,6 @@
+@@ -38627,9 +38575,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7705,7 +8583,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38663,8 +38501,7 @@
+@@ -38663,8 +38608,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7715,7 +8593,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38768,8 +38605,7 @@
+@@ -38768,8 +38712,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7725,7 +8603,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38901,8 +38737,7 @@
+@@ -38901,8 +38844,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7735,7 +8613,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38960,9 +38795,6 @@
+@@ -38960,9 +38902,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7745,7 +8623,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38995,8 +38827,7 @@
+@@ -38995,8 +38934,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7755,7 +8633,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39099,8 +38930,7 @@
+@@ -39099,8 +39037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7765,7 +8643,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39179,9 +39009,6 @@
+@@ -39179,9 +39116,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7775,7 +8653,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39216,8 +39043,7 @@
+@@ -39216,8 +39150,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7785,7 +8663,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39322,8 +39148,7 @@
+@@ -39322,8 +39255,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7795,7 +8673,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39402,9 +39227,6 @@
+@@ -39402,9 +39334,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7805,7 +8683,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39437,8 +39259,7 @@
+@@ -39437,8 +39366,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7815,7 +8693,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39541,8 +39362,7 @@
+@@ -39541,8 +39469,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7825,7 +8703,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39620,9 +39440,6 @@
+@@ -39620,9 +39547,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7835,7 +8713,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39655,8 +39472,7 @@
+@@ -39655,8 +39579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7845,7 +8723,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39759,8 +39575,7 @@
+@@ -39759,8 +39682,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7855,7 +8733,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39854,8 +39669,7 @@
+@@ -39854,8 +39776,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7865,7 +8743,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39915,9 +39729,6 @@
+@@ -39915,9 +39836,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7875,7 +8753,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39953,8 +39764,7 @@
+@@ -39953,8 +39871,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7885,7 +8763,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40060,8 +39870,7 @@
+@@ -40060,8 +39977,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7895,7 +8773,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40333,8 +40142,7 @@
+@@ -40333,8 +40249,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7905,7 +8783,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40506,8 +40314,7 @@
+@@ -40506,8 +40421,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7915,16 +8793,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40561,7 +40368,7 @@
+@@ -40561,7 +40475,7 @@
do
for j in qsql.html;
do
- echo "configure: 40564: $i/$j" >&5
-+ echo "configure: 40371: $i/$j" >&5
++ echo "configure: 40478: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -40756,8 +40563,7 @@
+@@ -40756,8 +40670,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7934,7 +8812,20 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40986,8 +40792,7 @@
+@@ -40956,7 +40869,11 @@
+ save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+ LDFLAGS="$all_libraries $LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $all_includes"
+-LIBS="-ldns_sd"
++case $host_os in
++ darwin*) LIBS="" ;;
++ *) LIBS="-ldns_sd" ;;
++esac
++have_libdns_sd="no"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -40986,8 +40903,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7944,7 +8835,29 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41179,8 +40984,7 @@
+@@ -41005,7 +40921,11 @@
+ #define HAVE_DNSSD 1
+ _ACEOF
+
+- LIB_DNSSD="-ldns_sd"
++ case $host_os in
++ darwin*) LIB_DNSSD="" ;;
++ *) LIB_DNSSD="-ldns_sd" ;;
++ esac
++ have_libdns_sd="yes"
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+
+@@ -41028,7 +40948,7 @@
+
+
+
+-if test -n "$LIB_DNSSD"; then
++if test "$have_libdns_sd" = "yes"; then
+ HAVE_DNSSD_TRUE=
+ HAVE_DNSSD_FALSE='#'
+ else
+@@ -41179,8 +41099,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7954,7 +8867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41254,8 +41058,7 @@
+@@ -41254,8 +41173,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7964,7 +8877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41459,8 +41262,7 @@
+@@ -41459,8 +41377,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7974,7 +8887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41529,8 +41331,7 @@
+@@ -41529,8 +41446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7984,7 +8897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41618,8 +41419,7 @@
+@@ -41618,8 +41534,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7994,7 +8907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41709,8 +41509,7 @@
+@@ -41709,8 +41624,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8004,7 +8917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41903,8 +41702,7 @@
+@@ -41903,8 +41817,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8014,7 +8927,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41970,8 +41768,7 @@
+@@ -41970,8 +41883,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8024,7 +8937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42075,8 +41872,7 @@
+@@ -42075,8 +41987,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8034,7 +8947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42177,8 +41973,7 @@
+@@ -42177,8 +42088,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8044,7 +8957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42333,8 +42128,7 @@
+@@ -42333,8 +42243,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8054,7 +8967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42378,8 +42172,7 @@
+@@ -42378,8 +42287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8064,7 +8977,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42447,8 +42240,7 @@
+@@ -42447,8 +42355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8074,7 +8987,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42509,8 +42301,7 @@
+@@ -42509,8 +42416,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8084,7 +8997,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42554,8 +42345,7 @@
+@@ -42554,8 +42460,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8094,7 +9007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42623,8 +42413,7 @@
+@@ -42623,8 +42528,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8104,7 +9017,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42690,8 +42479,7 @@
+@@ -42690,8 +42594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8114,7 +9027,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42961,8 +42749,7 @@
+@@ -42961,8 +42864,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8124,7 +9037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43107,8 +42894,7 @@
+@@ -43107,8 +43009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8134,7 +9047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43242,8 +43028,7 @@
+@@ -43242,8 +43143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8144,7 +9057,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43389,8 +43174,7 @@
+@@ -43389,8 +43289,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8154,7 +9067,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43481,8 +43265,7 @@
+@@ -43481,8 +43380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8164,7 +9077,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43651,8 +43434,7 @@
+@@ -43651,8 +43549,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8174,7 +9087,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43723,8 +43505,7 @@
+@@ -43723,8 +43620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8184,7 +9097,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43776,8 +43557,7 @@
+@@ -43776,8 +43672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8194,7 +9107,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43829,8 +43609,7 @@
+@@ -43829,8 +43724,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8204,7 +9117,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43882,8 +43661,7 @@
+@@ -43882,8 +43776,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8214,7 +9127,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43939,8 +43717,7 @@
+@@ -43939,8 +43832,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8224,7 +9137,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44085,8 +43862,7 @@
+@@ -44085,8 +43977,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8234,7 +9147,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44157,8 +43933,7 @@
+@@ -44157,8 +44048,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8244,7 +9157,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44497,8 +44272,7 @@
+@@ -44497,8 +44387,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8254,7 +9167,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44601,8 +44375,7 @@
+@@ -44601,8 +44490,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8264,7 +9177,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44671,8 +44444,7 @@
+@@ -44671,8 +44559,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8274,7 +9187,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44825,8 +44597,7 @@
+@@ -44825,8 +44712,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8284,7 +9197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44936,8 +44707,7 @@
+@@ -44936,8 +44822,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8294,7 +9207,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45042,8 +44812,7 @@
+@@ -45042,8 +44927,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8304,7 +9217,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45110,8 +44879,7 @@
+@@ -45110,8 +44994,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8314,7 +9227,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45213,8 +44981,7 @@
+@@ -45213,8 +45096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8324,7 +9237,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45547,8 +45314,7 @@
+@@ -45547,8 +45429,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8334,7 +9247,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45637,8 +45403,7 @@
+@@ -45637,8 +45518,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8344,7 +9257,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45727,8 +45492,7 @@
+@@ -45727,8 +45607,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8354,7 +9267,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45822,8 +45586,7 @@
+@@ -45822,8 +45701,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8364,7 +9277,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45997,8 +45760,7 @@
+@@ -45997,8 +45875,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8374,7 +9287,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46130,8 +45892,7 @@
+@@ -46130,8 +46007,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8384,7 +9297,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46227,8 +45988,7 @@
+@@ -46227,8 +46103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8394,7 +9307,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46352,8 +46112,7 @@
+@@ -46352,8 +46227,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8404,7 +9317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46436,8 +46195,7 @@
+@@ -46436,8 +46310,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8414,16 +9327,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46490,7 +46248,7 @@
+@@ -46490,7 +46363,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 46493: $i/$j" >&5
-+ echo "configure: 46251: $i/$j" >&5
++ echo "configure: 46366: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -46583,8 +46341,7 @@
+@@ -46583,8 +46456,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8433,7 +9346,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46680,8 +46437,7 @@
+@@ -46680,8 +46552,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8443,7 +9356,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46857,8 +46613,7 @@
+@@ -46857,8 +46728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8453,7 +9366,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46993,8 +46748,7 @@
+@@ -46993,8 +46863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8463,7 +9376,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47286,8 +47040,7 @@
+@@ -47286,8 +47155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8473,7 +9386,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47496,8 +47249,7 @@
+@@ -47496,8 +47364,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8483,7 +9396,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47592,8 +47344,7 @@
+@@ -47592,8 +47459,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8493,7 +9406,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47683,8 +47434,7 @@
+@@ -47683,8 +47549,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8503,7 +9416,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47869,8 +47619,7 @@
+@@ -47869,8 +47734,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8513,7 +9426,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47945,8 +47694,7 @@
+@@ -47945,8 +47809,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8523,7 +9436,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48083,8 +47831,7 @@
+@@ -48083,8 +47946,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8533,16 +9446,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48170,7 +47917,7 @@
+@@ -48170,7 +48032,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 48173: $i/$j" >&5
-+ echo "configure: 47920: $i/$j" >&5
++ echo "configure: 48035: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -48225,8 +47972,7 @@
+@@ -48225,8 +48087,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8552,7 +9465,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48527,8 +48273,7 @@
+@@ -48527,8 +48388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8562,7 +9475,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48749,8 +48494,7 @@
+@@ -48749,8 +48609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8572,25 +9485,34 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48904,7 +48648,7 @@
+@@ -48904,7 +48763,7 @@
do
for j in gssapi.h;
do
- echo "configure: 48907: $i/$j" >&5
-+ echo "configure: 48651: $i/$j" >&5
++ echo "configure: 48766: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_incdir=$i
-@@ -48926,7 +48670,7 @@
+@@ -48926,7 +48785,7 @@
do
for j in libgssapi.$ext;
do
- echo "configure: 48929: $i/$j" >&5
-+ echo "configure: 48673: $i/$j" >&5
++ echo "configure: 48788: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_libdir=$i
-@@ -49045,8 +48789,7 @@
+@@ -48954,7 +48813,7 @@
+ no) echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6 ;;
+ framework)
+- GSSAPI_LIBS="-Xlinker -framework -Xlinker GSSAPI"
++ GSSAPI_LIBS="-Xlinker -framework -Xlinker Kerberos"
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBGSSAPI 1
+@@ -49045,8 +48904,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8600,7 +9522,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49199,8 +48942,7 @@
+@@ -49199,8 +49057,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8610,7 +9532,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49273,8 +49015,7 @@
+@@ -49273,8 +49130,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8620,7 +9542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49347,8 +49088,7 @@
+@@ -49347,8 +49203,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8630,7 +9552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49421,8 +49161,7 @@
+@@ -49421,8 +49276,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8640,7 +9562,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49572,8 +49311,7 @@
+@@ -49572,8 +49426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8650,7 +9572,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49691,8 +49429,7 @@
+@@ -49691,8 +49544,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8660,7 +9582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49768,8 +49505,7 @@
+@@ -49768,8 +49620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8670,7 +9592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49989,8 +49725,7 @@
+@@ -49989,8 +49840,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8680,7 +9602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50157,8 +49892,7 @@
+@@ -50157,8 +50007,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8690,7 +9612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50323,8 +50057,7 @@
+@@ -50323,8 +50172,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8700,7 +9622,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50385,8 +50118,7 @@
+@@ -50385,8 +50233,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8710,7 +9632,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50453,8 +50185,7 @@
+@@ -50453,8 +50300,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8720,7 +9642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50534,8 +50265,7 @@
+@@ -50534,8 +50380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8730,7 +9652,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51519,6 +51249,13 @@
+@@ -51519,6 +51364,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -8744,7 +9666,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
-@@ -52699,6 +52436,9 @@
+@@ -52699,6 +52551,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -8754,7 +9676,7 @@
s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
-@@ -53191,11 +52931,6 @@
+@@ -53191,11 +53046,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -8766,7 +9688,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. */
-@@ -53234,6 +52969,12 @@
+@@ -53234,6 +53084,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -8779,9 +9701,18 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -u -x debian -Nru kdelibs-3.4.0.orig/configure.in kdelibs-3.4.0/configure.in
---- kdelibs-3.4.0.orig/configure.in 2005-03-04 14:20:29.000000000 +0100
-+++ kdelibs-3.4.0/configure.in 2005-03-04 20:39:07.599020188 +0100
+@@ -53745,7 +53601,7 @@
+ $ac_cs_success || { (exit 1); exit 1; }
+ fi
+
+-if test -z "$LIB_DNSSD"; then
++if test "$have_libdns_sd" = "no"; then
+ echo ""
+ echo "You're missing Apple mDNSResponder 85 or later, therefore"
+ echo "dnssd will be compiled as stub, without any real functionality."
+diff -Nrua kdelibs-3.4.0.orig/configure.in kdelibs-3.4.0/configure.in
+--- kdelibs-3.4.0.orig/configure.in 2005-03-04 08:20:29.000000000 -0500
++++ kdelibs-3.4.0/configure.in 2005-03-18 16:00:51.000000000 -0500
@@ -23,6 +23,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdelibs, "3.4.0") dnl searches for some needed programs
@@ -8791,13 +9722,67 @@
AC_PROG_INSTALL
dnl generate the config header
-diff -u -x debian -Nru kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in
---- kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in 2005-03-04 20:41:26.805256628 +0100
+@@ -444,7 +446,11 @@
+ save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+ LDFLAGS="$all_libraries $LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $all_includes"
+-LIBS="-ldns_sd"
++case $host_os in
++ darwin*) LIBS="" ;;
++ *) LIBS="-ldns_sd" ;;
++esac
++have_libdns_sd="no"
+ AC_TRY_LINK( [
+ #include <dns_sd.h>
+ ],[
+@@ -452,7 +458,11 @@
+ TXTRecordDeallocate( (TXTRecordRef*) 0);
+ ],[
+ AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
+- LIB_DNSSD="-ldns_sd"
++ case $host_os in
++ darwin*) LIB_DNSSD="" ;;
++ *) LIB_DNSSD="-ldns_sd" ;;
++ esac
++ have_libdns_sd="yes"
+ AC_MSG_RESULT(yes)
+ ],[
+ AC_MSG_RESULT(no)
+@@ -463,7 +473,7 @@
+ LIBS=$save_dnssdtest_LIBS
+ fi
+ AC_SUBST(LIB_DNSSD)
+-AM_CONDITIONAL(HAVE_DNSSD, test -n "$LIB_DNSSD")
++AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")
+
+ dnl =======================================================
+ dnl FILE: ./kdecore/configure.in.in
+@@ -1662,7 +1672,7 @@
+ case "$with_gssapi" in
+ no) AC_MSG_RESULT(no) ;;
+ framework)
+- GSSAPI_LIBS="-Xlinker -framework -Xlinker GSSAPI"
++ GSSAPI_LIBS="-Xlinker -framework -Xlinker Kerberos"
+ AC_DEFINE_UNQUOTED(HAVE_LIBGSSAPI, 1, [Define if you have GSSAPI libraries])
+ GSSAPI_SUBDIR="gssapi"
+ AC_MSG_RESULT(Apple framework)
+@@ -2177,7 +2187,7 @@
+
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+ AC_OUTPUT
+-if test -z "$LIB_DNSSD"; then
++if test "$have_libdns_sd" = "no"; then
+ echo ""
+ echo "You're missing Apple mDNSResponder 85 or later, therefore"
+ echo "dnssd will be compiled as stub, without any real functionality."
+diff -Nrua kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in
+--- kdelibs-3.4.0.orig/dcop/KDE-ICE/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dcop/KDE-ICE/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -8851,13 +9836,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/dcop/Makefile.in kdelibs-3.4.0/dcop/Makefile.in
---- kdelibs-3.4.0.orig/dcop/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/dcop/Makefile.in 2005-03-04 20:41:26.967228976 +0100
+@@ -844,7 +847,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/dcop/Makefile.in kdelibs-3.4.0/dcop/Makefile.in
+--- kdelibs-3.4.0.orig/dcop/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dcop/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9034,13 +10029,14 @@
libkdeinit_dcopserver.la: $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libkdeinit_dcopserver_la_LDFLAGS) $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_LIBADD) $(LIBS)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/dcop/client/Makefile.in kdelibs-3.4.0/dcop/client/Makefile.in
---- kdelibs-3.4.0.orig/dcop/client/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/dcop/client/Makefile.in 2005-03-04 20:41:26.985225903 +0100
+diff -Nrua kdelibs-3.4.0.orig/dcop/client/Makefile.in kdelibs-3.4.0/dcop/client/Makefile.in
+--- kdelibs-3.4.0.orig/dcop/client/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dcop/client/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9116,13 +10112,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/dcop/dcopidl/Makefile.in kdelibs-3.4.0/dcop/dcopidl/Makefile.in
---- kdelibs-3.4.0.orig/dcop/dcopidl/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/dcop/dcopidl/Makefile.in 2005-03-04 20:41:26.998223684 +0100
+diff -Nrua kdelibs-3.4.0.orig/dcop/dcopidl/Makefile.in kdelibs-3.4.0/dcop/dcopidl/Makefile.in
+--- kdelibs-3.4.0.orig/dcop/dcopidl/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dcop/dcopidl/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9185,13 +10182,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/dcop/dcopidl2cpp/Makefile.in kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in
---- kdelibs-3.4.0.orig/dcop/dcopidl2cpp/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in 2005-03-04 20:41:27.010221636 +0100
+diff -Nrua kdelibs-3.4.0.orig/dcop/dcopidl2cpp/Makefile.in kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in
+--- kdelibs-3.4.0.orig/dcop/dcopidl2cpp/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dcop/dcopidl2cpp/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9254,13 +10252,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/dcop/dcopidlng/Makefile.in kdelibs-3.4.0/dcop/dcopidlng/Makefile.in
---- kdelibs-3.4.0.orig/dcop/dcopidlng/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/dcop/dcopidlng/Makefile.in 2005-03-04 20:41:27.018220270 +0100
+diff -Nrua kdelibs-3.4.0.orig/dcop/dcopidlng/Makefile.in kdelibs-3.4.0/dcop/dcopidlng/Makefile.in
+--- kdelibs-3.4.0.orig/dcop/dcopidlng/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dcop/dcopidlng/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9309,13 +10308,23 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/dcop/tests/Makefile.in kdelibs-3.4.0/dcop/tests/Makefile.in
---- kdelibs-3.4.0.orig/dcop/tests/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/dcop/tests/Makefile.in 2005-03-04 20:41:27.033217710 +0100
+@@ -749,7 +752,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/dcop/tests/Makefile.in kdelibs-3.4.0/dcop/tests/Makefile.in
+--- kdelibs-3.4.0.orig/dcop/tests/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dcop/tests/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9378,13 +10387,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/dnssd/Makefile.in kdelibs-3.4.0/dnssd/Makefile.in
---- kdelibs-3.4.0.orig/dnssd/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/dnssd/Makefile.in 2005-03-04 20:41:27.000000000 +0100
+diff -Nrua kdelibs-3.4.0.orig/dnssd/Makefile.in kdelibs-3.4.0/dnssd/Makefile.in
+--- kdelibs-3.4.0.orig/dnssd/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/dnssd/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9493,13 +10503,14 @@
@echo 'creating libkdnssd_la.all_cpp.cpp ...'; \
rm -f libkdnssd_la.all_cpp.files libkdnssd_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdnssd_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/doc/Makefile.in kdelibs-3.4.0/doc/Makefile.in
---- kdelibs-3.4.0.orig/doc/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/doc/Makefile.in 2005-03-04 20:41:27.094207298 +0100
+diff -Nrua kdelibs-3.4.0.orig/doc/Makefile.in kdelibs-3.4.0/doc/Makefile.in
+--- kdelibs-3.4.0.orig/doc/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/doc/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9587,13 +10598,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/doc/common/Makefile.in kdelibs-3.4.0/doc/common/Makefile.in
---- kdelibs-3.4.0.orig/doc/common/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/doc/common/Makefile.in 2005-03-04 20:41:27.103205761 +0100
+@@ -817,7 +832,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/doc/common/Makefile.in kdelibs-3.4.0/doc/common/Makefile.in
+--- kdelibs-3.4.0.orig/doc/common/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/doc/common/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9642,13 +10663,23 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/doc/kdelibs/Makefile.in kdelibs-3.4.0/doc/kdelibs/Makefile.in
---- kdelibs-3.4.0.orig/doc/kdelibs/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/doc/kdelibs/Makefile.in 2005-03-04 20:41:27.111204396 +0100
+@@ -712,7 +715,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/doc/kdelibs/Makefile.in kdelibs-3.4.0/doc/kdelibs/Makefile.in
+--- kdelibs-3.4.0.orig/doc/kdelibs/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/doc/kdelibs/Makefile.in 2005-03-18 16:04:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9688,13 +10719,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/doc/kspell/Makefile.in kdelibs-3.4.0/doc/kspell/Makefile.in
---- kdelibs-3.4.0.orig/doc/kspell/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/doc/kspell/Makefile.in 2005-03-04 20:41:27.120202859 +0100
+@@ -667,7 +670,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/doc/kspell/Makefile.in kdelibs-3.4.0/doc/kspell/Makefile.in
+--- kdelibs-3.4.0.orig/doc/kspell/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/doc/kspell/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9734,13 +10775,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/Makefile.in kdelibs-3.4.0/interfaces/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/Makefile.in 2005-03-04 20:41:27.130201153 +0100
+@@ -715,7 +718,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/Makefile.in kdelibs-3.4.0/interfaces/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9828,13 +10879,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/khexedit/Makefile.in kdelibs-3.4.0/interfaces/khexedit/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/khexedit/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/khexedit/Makefile.in 2005-03-04 20:41:27.138199787 +0100
+@@ -997,7 +1012,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/khexedit/Makefile.in kdelibs-3.4.0/interfaces/khexedit/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/khexedit/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/khexedit/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9874,13 +10935,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kimproxy/Makefile.in 2005-03-04 20:41:27.147198251 +0100
+@@ -778,7 +781,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kimproxy/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -9968,13 +11039,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in 2005-03-04 20:41:27.156196714 +0100
+@@ -817,7 +832,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kimproxy/interface/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/interface/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10014,13 +11095,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/library/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kimproxy/library/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in 2005-03-04 20:41:27.200189204 +0100
+@@ -794,7 +797,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kimproxy/library/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kimproxy/library/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/library/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10131,13 +11222,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in 2005-03-04 20:41:27.210187497 +0100
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kimproxy/library/icons/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kimproxy/library/icons/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10235,13 +11327,23 @@
#>+ 15
force-reedit:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kio/Makefile.in kdelibs-3.4.0/interfaces/kio/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kio/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kio/Makefile.in 2005-03-04 20:41:27.218186131 +0100
+@@ -699,7 +702,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kio/Makefile.in kdelibs-3.4.0/interfaces/kio/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kio/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kio/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10281,13 +11383,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in 2005-03-04 20:41:27.249180840 +0100
+@@ -744,7 +747,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kmediaplayer/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kmediaplayer/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10398,13 +11510,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-03-04 20:41:27.277176060 +0100
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10467,13 +11580,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kregexpeditor/Makefile.in kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kregexpeditor/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in 2005-03-04 20:41:27.286174524 +0100
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kregexpeditor/Makefile.in kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kregexpeditor/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kregexpeditor/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10513,13 +11627,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kscript/Makefile.in kdelibs-3.4.0/interfaces/kscript/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kscript/Makefile.in 2005-03-04 14:23:07.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kscript/Makefile.in 2005-03-04 20:41:27.330167014 +0100
+@@ -772,7 +775,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kscript/Makefile.in kdelibs-3.4.0/interfaces/kscript/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kscript/Makefile.in 2005-03-04 08:23:07.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kscript/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10630,13 +11754,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kscript/sample/Makefile.in kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kscript/sample/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in 2005-03-04 20:41:27.344164624 +0100
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kscript/sample/Makefile.in kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kscript/sample/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kscript/sample/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10699,13 +11824,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/kspeech/Makefile.in kdelibs-3.4.0/interfaces/kspeech/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/kspeech/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/kspeech/Makefile.in 2005-03-04 20:41:27.354162917 +0100
+diff -Nrua kdelibs-3.4.0.orig/interfaces/kspeech/Makefile.in kdelibs-3.4.0/interfaces/kspeech/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/kspeech/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/interfaces/kspeech/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10745,13 +11871,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/ktexteditor/Makefile.in kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/ktexteditor/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in 2005-03-04 20:41:27.445147384 +0100
+@@ -951,7 +954,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/ktexteditor/Makefile.in kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/ktexteditor/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/interfaces/ktexteditor/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10814,13 +11950,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/terminal/Makefile.in kdelibs-3.4.0/interfaces/terminal/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/terminal/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/terminal/Makefile.in 2005-03-04 20:41:27.453146018 +0100
+diff -Nrua kdelibs-3.4.0.orig/interfaces/terminal/Makefile.in kdelibs-3.4.0/interfaces/terminal/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/terminal/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/interfaces/terminal/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10860,13 +11997,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/interfaces/terminal/test/Makefile.in kdelibs-3.4.0/interfaces/terminal/test/Makefile.in
---- kdelibs-3.4.0.orig/interfaces/terminal/test/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/interfaces/terminal/test/Makefile.in 2005-03-04 20:41:27.465143970 +0100
+@@ -744,7 +747,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/interfaces/terminal/test/Makefile.in kdelibs-3.4.0/interfaces/terminal/test/Makefile.in
+--- kdelibs-3.4.0.orig/interfaces/terminal/test/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/interfaces/terminal/test/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10929,13 +12076,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kab/Makefile.in kdelibs-3.4.0/kab/Makefile.in
---- kdelibs-3.4.0.orig/kab/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kab/Makefile.in 2005-03-04 20:41:27.559127925 +0100
+diff -Nrua kdelibs-3.4.0.orig/kab/Makefile.in kdelibs-3.4.0/kab/Makefile.in
+--- kdelibs-3.4.0.orig/kab/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kab/Makefile.in 2005-03-18 16:05:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -10998,13 +12146,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/Makefile.in kdelibs-3.4.0/kabc/Makefile.in
---- kdelibs-3.4.0.orig/kabc/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/Makefile.in 2005-03-04 20:41:27.811084910 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/Makefile.in kdelibs-3.4.0/kabc/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11191,13 +12340,14 @@
@echo 'creating libkabc_la.all_cpp.cpp ...'; \
rm -f libkabc_la.all_cpp.files libkabc_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkabc_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/formats/Makefile.in kdelibs-3.4.0/kabc/formats/Makefile.in
---- kdelibs-3.4.0.orig/kabc/formats/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/formats/Makefile.in 2005-03-04 20:41:27.825082520 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/formats/Makefile.in kdelibs-3.4.0/kabc/formats/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/formats/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/formats/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11260,13 +12410,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/plugins/Makefile.in kdelibs-3.4.0/kabc/plugins/Makefile.in
---- kdelibs-3.4.0.orig/kabc/plugins/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/plugins/Makefile.in 2005-03-04 20:41:27.834080984 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/Makefile.in kdelibs-3.4.0/kabc/plugins/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/plugins/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11354,13 +12505,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/plugins/dir/Makefile.in kdelibs-3.4.0/kabc/plugins/dir/Makefile.in
---- kdelibs-3.4.0.orig/kabc/plugins/dir/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/plugins/dir/Makefile.in 2005-03-04 20:41:27.865075692 +0100
+@@ -821,7 +836,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/dir/Makefile.in kdelibs-3.4.0/kabc/plugins/dir/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/plugins/dir/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/dir/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11423,13 +12584,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/plugins/evolution/Makefile.in kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in
---- kdelibs-3.4.0.orig/kabc/plugins/evolution/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in 2005-03-04 20:41:27.880073132 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/evolution/Makefile.in kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/plugins/evolution/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/evolution/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11492,13 +12654,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/plugins/file/Makefile.in kdelibs-3.4.0/kabc/plugins/file/Makefile.in
---- kdelibs-3.4.0.orig/kabc/plugins/file/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/plugins/file/Makefile.in 2005-03-04 20:41:27.914067328 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/file/Makefile.in kdelibs-3.4.0/kabc/plugins/file/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/plugins/file/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/file/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11604,13 +12767,14 @@
@echo 'creating libkabc_file_la.all_cpp.cpp ...'; \
rm -f libkabc_file_la.all_cpp.files libkabc_file_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkabc_file_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/plugins/ldapkio/Makefile.in kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in
---- kdelibs-3.4.0.orig/kabc/plugins/ldapkio/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in 2005-03-04 20:41:27.966058452 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/ldapkio/Makefile.in kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/plugins/ldapkio/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/ldapkio/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11673,13 +12837,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/plugins/net/Makefile.in kdelibs-3.4.0/kabc/plugins/net/Makefile.in
---- kdelibs-3.4.0.orig/kabc/plugins/net/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/plugins/net/Makefile.in 2005-03-04 20:41:28.014050258 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/net/Makefile.in kdelibs-3.4.0/kabc/plugins/net/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/plugins/net/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/net/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11785,13 +12950,14 @@
@echo 'creating libkabc_net_la.all_cpp.cpp ...'; \
rm -f libkabc_net_la.all_cpp.files libkabc_net_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkabc_net_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/plugins/sql/Makefile.in kdelibs-3.4.0/kabc/plugins/sql/Makefile.in
---- kdelibs-3.4.0.orig/kabc/plugins/sql/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/plugins/sql/Makefile.in 2005-03-04 20:41:28.040045820 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/plugins/sql/Makefile.in kdelibs-3.4.0/kabc/plugins/sql/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/plugins/sql/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/plugins/sql/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11863,13 +13029,14 @@
#>+ 3
clean-closures:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/scripts/Makefile.in kdelibs-3.4.0/kabc/scripts/Makefile.in
---- kdelibs-3.4.0.orig/kabc/scripts/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/scripts/Makefile.in 2005-03-04 20:41:28.048044455 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/scripts/Makefile.in kdelibs-3.4.0/kabc/scripts/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/scripts/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/scripts/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11909,13 +13076,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/vcard/Makefile.in kdelibs-3.4.0/kabc/vcard/Makefile.in
---- kdelibs-3.4.0.orig/kabc/vcard/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/vcard/Makefile.in 2005-03-04 20:41:28.063041894 +0100
+@@ -671,7 +674,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kabc/vcard/Makefile.in kdelibs-3.4.0/kabc/vcard/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/vcard/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/vcard/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -11987,13 +13164,14 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kabc/vcardparser/Makefile.in kdelibs-3.4.0/kabc/vcardparser/Makefile.in
---- kdelibs-3.4.0.orig/kabc/vcardparser/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kabc/vcardparser/Makefile.in 2005-03-04 20:41:28.078039334 +0100
+diff -Nrua kdelibs-3.4.0.orig/kabc/vcardparser/Makefile.in kdelibs-3.4.0/kabc/vcardparser/Makefile.in
+--- kdelibs-3.4.0.orig/kabc/vcardparser/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kabc/vcardparser/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12056,13 +13234,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/Makefile.in kdelibs-3.4.0/kate/Makefile.in
---- kdelibs-3.4.0.orig/kate/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kate/Makefile.in 2005-03-04 20:41:28.088037627 +0100
+diff -Nrua kdelibs-3.4.0.orig/kate/Makefile.in kdelibs-3.4.0/kate/Makefile.in
+--- kdelibs-3.4.0.orig/kate/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kate/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12150,13 +13329,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/data/Makefile.in kdelibs-3.4.0/kate/data/Makefile.in
---- kdelibs-3.4.0.orig/kate/data/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kate/data/Makefile.in 2005-03-04 20:41:28.103035067 +0100
+@@ -1003,7 +1018,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kate/data/Makefile.in kdelibs-3.4.0/kate/data/Makefile.in
+--- kdelibs-3.4.0.orig/kate/data/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kate/data/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12205,13 +13394,23 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/interfaces/Makefile.in kdelibs-3.4.0/kate/interfaces/Makefile.in
---- kdelibs-3.4.0.orig/kate/interfaces/Makefile.in 2005-03-04 14:23:08.000000000 +0100
-+++ kdelibs-3.4.0/kate/interfaces/Makefile.in 2005-03-04 20:41:28.134029775 +0100
+@@ -790,7 +793,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kate/interfaces/Makefile.in kdelibs-3.4.0/kate/interfaces/Makefile.in
+--- kdelibs-3.4.0.orig/kate/interfaces/Makefile.in 2005-03-04 08:23:08.000000000 -0500
++++ kdelibs-3.4.0/kate/interfaces/Makefile.in 2005-03-18 16:05:01.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12274,13 +13473,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/part/Makefile.in kdelibs-3.4.0/kate/part/Makefile.in
---- kdelibs-3.4.0.orig/kate/part/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kate/part/Makefile.in 2005-03-04 20:41:28.611948183 +0100
+diff -Nrua kdelibs-3.4.0.orig/kate/part/Makefile.in kdelibs-3.4.0/kate/part/Makefile.in
+--- kdelibs-3.4.0.orig/kate/part/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kate/part/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12440,13 +13640,14 @@
@echo 'creating libkatepart_la.all_cpp.cpp ...'; \
rm -f libkatepart_la.all_cpp.files libkatepart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkatepart_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/plugins/Makefile.in kdelibs-3.4.0/kate/plugins/Makefile.in
---- kdelibs-3.4.0.orig/kate/plugins/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kate/plugins/Makefile.in 2005-03-04 20:41:28.620946647 +0100
+diff -Nrua kdelibs-3.4.0.orig/kate/plugins/Makefile.in kdelibs-3.4.0/kate/plugins/Makefile.in
+--- kdelibs-3.4.0.orig/kate/plugins/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12534,13 +13735,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/plugins/autobookmarker/Makefile.in kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in
---- kdelibs-3.4.0.orig/kate/plugins/autobookmarker/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in 2005-03-04 20:41:28.650941526 +0100
+@@ -817,7 +832,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kate/plugins/autobookmarker/Makefile.in kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in
+--- kdelibs-3.4.0.orig/kate/plugins/autobookmarker/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/autobookmarker/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12603,13 +13814,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/plugins/insertfile/Makefile.in kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in
---- kdelibs-3.4.0.orig/kate/plugins/insertfile/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in 2005-03-04 20:41:28.679936576 +0100
+diff -Nrua kdelibs-3.4.0.orig/kate/plugins/insertfile/Makefile.in kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in
+--- kdelibs-3.4.0.orig/kate/plugins/insertfile/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/insertfile/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12672,13 +13884,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/plugins/isearch/Makefile.in kdelibs-3.4.0/kate/plugins/isearch/Makefile.in
---- kdelibs-3.4.0.orig/kate/plugins/isearch/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kate/plugins/isearch/Makefile.in 2005-03-04 20:41:28.700932991 +0100
+diff -Nrua kdelibs-3.4.0.orig/kate/plugins/isearch/Makefile.in kdelibs-3.4.0/kate/plugins/isearch/Makefile.in
+--- kdelibs-3.4.0.orig/kate/plugins/isearch/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/isearch/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12741,13 +13954,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/plugins/kdatatool/Makefile.in kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in
---- kdelibs-3.4.0.orig/kate/plugins/kdatatool/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in 2005-03-04 20:41:28.722929236 +0100
+diff -Nrua kdelibs-3.4.0.orig/kate/plugins/kdatatool/Makefile.in kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in
+--- kdelibs-3.4.0.orig/kate/plugins/kdatatool/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/kdatatool/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12810,13 +14024,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kate/plugins/wordcompletion/Makefile.in kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in
---- kdelibs-3.4.0.orig/kate/plugins/wordcompletion/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in 2005-03-04 20:41:28.748924798 +0100
+diff -Nrua kdelibs-3.4.0.orig/kate/plugins/wordcompletion/Makefile.in kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in
+--- kdelibs-3.4.0.orig/kate/plugins/wordcompletion/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kate/plugins/wordcompletion/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12879,13 +14094,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kcert/Makefile.in kdelibs-3.4.0/kcert/Makefile.in
---- kdelibs-3.4.0.orig/kcert/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kcert/Makefile.in 2005-03-04 20:41:28.000000000 +0100
+diff -Nrua kdelibs-3.4.0.orig/kcert/Makefile.in kdelibs-3.4.0/kcert/Makefile.in
+--- kdelibs-3.4.0.orig/kcert/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kcert/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -12948,13 +14164,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kcmshell/Makefile.in kdelibs-3.4.0/kcmshell/Makefile.in
---- kdelibs-3.4.0.orig/kcmshell/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kcmshell/Makefile.in 2005-03-04 20:41:28.808914556 +0100
+diff -Nrua kdelibs-3.4.0.orig/kcmshell/Makefile.in kdelibs-3.4.0/kcmshell/Makefile.in
+--- kdelibs-3.4.0.orig/kcmshell/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kcmshell/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13017,13 +14234,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kconf_update/Makefile.in kdelibs-3.4.0/kconf_update/Makefile.in
---- kdelibs-3.4.0.orig/kconf_update/Makefile.in 2005-03-04 14:23:09.000000000 +0100
-+++ kdelibs-3.4.0/kconf_update/Makefile.in 2005-03-04 20:41:28.826911484 +0100
+diff -Nrua kdelibs-3.4.0.orig/kconf_update/Makefile.in kdelibs-3.4.0/kconf_update/Makefile.in
+--- kdelibs-3.4.0.orig/kconf_update/Makefile.in 2005-03-04 08:23:09.000000000 -0500
++++ kdelibs-3.4.0/kconf_update/Makefile.in 2005-03-18 16:05:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13086,13 +14304,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdecore/Makefile.in kdelibs-3.4.0/kdecore/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/Makefile.in 2005-03-04 14:23:11.000000000 +0100
-+++ kdelibs-3.4.0/kdecore/Makefile.in 2005-03-04 20:41:30.442635640 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdecore/Makefile.in kdelibs-3.4.0/kdecore/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/Makefile.in 2005-03-04 08:23:11.000000000 -0500
++++ kdelibs-3.4.0/kdecore/Makefile.in 2005-03-18 16:05:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13293,13 +14512,14 @@
@echo 'creating libkdecore_la.all_cpp.cpp ...'; \
rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in 2005-03-04 14:23:11.000000000 +0100
-+++ kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in 2005-03-04 20:41:30.000000000 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/Makefile.in 2005-03-04 08:23:11.000000000 -0500
++++ kdelibs-3.4.0/kdecore/kconfig_compiler/Makefile.in 2005-03-18 16:05:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13410,13 +14630,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in 2005-03-04 14:23:11.000000000 +0100
-+++ kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in 2005-03-04 20:41:30.000000000 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/kconfig_compiler/tests/Makefile.in 2005-03-04 08:23:11.000000000 -0500
++++ kdelibs-3.4.0/kdecore/kconfig_compiler/tests/Makefile.in 2005-03-18 16:05:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13488,13 +14709,14 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdecore/malloc/Makefile.in kdelibs-3.4.0/kdecore/malloc/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/malloc/Makefile.in 2005-03-04 14:23:11.000000000 +0100
-+++ kdelibs-3.4.0/kdecore/malloc/Makefile.in 2005-03-04 20:41:30.000000000 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdecore/malloc/Makefile.in kdelibs-3.4.0/kdecore/malloc/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/malloc/Makefile.in 2005-03-04 08:23:11.000000000 -0500
++++ kdelibs-3.4.0/kdecore/malloc/Makefile.in 2005-03-18 16:05:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13548,13 +14770,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdecore/network/Makefile.in kdelibs-3.4.0/kdecore/network/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/network/Makefile.in 2005-03-04 14:23:11.000000000 +0100
-+++ kdelibs-3.4.0/kdecore/network/Makefile.in 2005-03-04 20:41:30.000000000 +0100
+@@ -804,7 +807,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kdecore/network/Makefile.in kdelibs-3.4.0/kdecore/network/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/network/Makefile.in 2005-03-04 08:23:11.000000000 -0500
++++ kdelibs-3.4.0/kdecore/network/Makefile.in 2005-03-18 16:05:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13695,13 +14927,14 @@
+kdatagramsocket.lo: kdatagramsocket.moc
kresolver.o: kresolver.moc
kclientsocketbase.lo: kclientsocketbase.moc
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdecore/svgicons/Makefile.in kdelibs-3.4.0/kdecore/svgicons/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/svgicons/Makefile.in 2005-03-04 14:23:11.000000000 +0100
-+++ kdelibs-3.4.0/kdecore/svgicons/Makefile.in 2005-03-04 20:41:30.000000000 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdecore/svgicons/Makefile.in kdelibs-3.4.0/kdecore/svgicons/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/svgicons/Makefile.in 2005-03-04 08:23:11.000000000 -0500
++++ kdelibs-3.4.0/kdecore/svgicons/Makefile.in 2005-03-18 16:05:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13764,13 +14997,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdecore/tests/Makefile.in kdelibs-3.4.0/kdecore/tests/Makefile.in
---- kdelibs-3.4.0.orig/kdecore/tests/Makefile.in 2005-03-04 14:23:12.000000000 +0100
-+++ kdelibs-3.4.0/kdecore/tests/Makefile.in 2005-03-04 20:41:30.000000000 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdecore/tests/Makefile.in kdelibs-3.4.0/kdecore/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kdecore/tests/Makefile.in 2005-03-04 08:23:12.000000000 -0500
++++ kdelibs-3.4.0/kdecore/tests/Makefile.in 2005-03-18 16:05:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13867,13 +15101,14 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kded/Makefile.in kdelibs-3.4.0/kded/Makefile.in
---- kdelibs-3.4.0.orig/kded/Makefile.in 2005-03-04 14:23:12.000000000 +0100
-+++ kdelibs-3.4.0/kded/Makefile.in 2005-03-04 20:41:33.460120481 +0100
+diff -Nrua kdelibs-3.4.0.orig/kded/Makefile.in kdelibs-3.4.0/kded/Makefile.in
+--- kdelibs-3.4.0.orig/kded/Makefile.in 2005-03-04 08:23:12.000000000 -0500
++++ kdelibs-3.4.0/kded/Makefile.in 2005-03-18 16:05:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -13970,13 +15205,14 @@
#>+ 2
KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kded/test/Makefile.in kdelibs-3.4.0/kded/test/Makefile.in
---- kdelibs-3.4.0.orig/kded/test/Makefile.in 2005-03-04 14:23:12.000000000 +0100
-+++ kdelibs-3.4.0/kded/test/Makefile.in 2005-03-04 20:41:33.534107849 +0100
+diff -Nrua kdelibs-3.4.0.orig/kded/test/Makefile.in kdelibs-3.4.0/kded/test/Makefile.in
+--- kdelibs-3.4.0.orig/kded/test/Makefile.in 2005-03-04 08:23:12.000000000 -0500
++++ kdelibs-3.4.0/kded/test/Makefile.in 2005-03-18 16:05:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14039,13 +15275,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdefx/Makefile.in kdelibs-3.4.0/kdefx/Makefile.in
---- kdelibs-3.4.0.orig/kdefx/Makefile.in 2005-03-04 14:23:12.000000000 +0100
-+++ kdelibs-3.4.0/kdefx/Makefile.in 2005-03-04 20:41:33.000000000 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdefx/Makefile.in kdelibs-3.4.0/kdefx/Makefile.in
+--- kdelibs-3.4.0.orig/kdefx/Makefile.in 2005-03-04 08:23:12.000000000 -0500
++++ kdelibs-3.4.0/kdefx/Makefile.in 2005-03-18 16:05:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14108,13 +15345,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/Makefile.in kdelibs-3.4.0/kdeprint/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/Makefile.in 2005-03-04 14:23:13.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/Makefile.in 2005-03-04 20:41:34.281980169 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/Makefile.in kdelibs-3.4.0/kdeprint/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/Makefile.in 2005-03-04 08:23:13.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/Makefile.in 2005-03-18 16:05:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14347,13 +15585,14 @@
#>+ 2
KDE_DIST=ppdparser.y testprint.ps kdeprintrc.upd Makefile.in specials.desktop fooparser.cpp.h kdeprintrc configure.in.in kdeprintd.desktop signal_proc.c ppdscanner.l ppdparser.cpp.h Makefile.am
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in kdelibs-3.4.0/kdeprint/cups/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in 2005-03-04 14:23:14.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/cups/Makefile.in 2005-03-04 20:41:34.631920425 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in kdelibs-3.4.0/kdeprint/cups/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/cups/Makefile.in 2005-03-04 08:23:14.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/cups/Makefile.in 2005-03-18 16:05:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14555,13 +15794,14 @@
kmwippprinter.o: kmwippprinter.moc
kptextpage.lo: kptextpage.moc
kmwippprinter.lo: kmwippprinter.moc
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf/Makefile.in 2005-03-04 14:23:14.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in 2005-03-04 20:41:34.741901648 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf/Makefile.in 2005-03-04 08:23:14.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/cups/cupsdconf/Makefile.in 2005-03-18 16:05:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14682,13 +15922,14 @@
#>+ 2
KDE_DIST=kde_logo.png Makefile.in cupsd.conf.template cups_logo.png findnewopts.sh Makefile.am
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf2/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf2/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in 2005-03-04 20:41:34.831886286 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf2/Makefile.in kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/cups/cupsdconf2/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/cups/cupsdconf2/Makefile.in 2005-03-18 16:05:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14873,13 +16114,14 @@
-cupsdserverpage.o: cupsdserverpage.moc
cupsdnetworkpage.lo: cupsdnetworkpage.moc
+cupsdserverpage.o: cupsdserverpage.moc
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/ext/Makefile.in kdelibs-3.4.0/kdeprint/ext/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/ext/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/ext/Makefile.in 2005-03-04 20:41:34.858881677 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/ext/Makefile.in kdelibs-3.4.0/kdeprint/ext/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/ext/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/ext/Makefile.in 2005-03-18 16:05:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14942,13 +16184,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/filters/Makefile.in kdelibs-3.4.0/kdeprint/filters/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/filters/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/filters/Makefile.in 2005-03-04 20:41:34.866880311 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/filters/Makefile.in kdelibs-3.4.0/kdeprint/filters/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/filters/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/filters/Makefile.in 2005-03-18 16:05:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -14988,13 +16231,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/foomatic/Makefile.in kdelibs-3.4.0/kdeprint/foomatic/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/foomatic/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/foomatic/Makefile.in 2005-03-04 20:41:34.883877409 +0100
+@@ -731,7 +734,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/foomatic/Makefile.in kdelibs-3.4.0/kdeprint/foomatic/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/foomatic/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/foomatic/Makefile.in 2005-03-18 16:05:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15070,13 +16323,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/lpd/Makefile.in kdelibs-3.4.0/kdeprint/lpd/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/lpd/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/lpd/Makefile.in 2005-03-04 20:41:34.900874508 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/lpd/Makefile.in kdelibs-3.4.0/kdeprint/lpd/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/lpd/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/lpd/Makefile.in 2005-03-18 16:05:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15152,13 +16406,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/lpdunix/Makefile.in kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/lpdunix/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in 2005-03-04 20:41:34.916871776 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/lpdunix/Makefile.in kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/lpdunix/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/lpdunix/Makefile.in 2005-03-18 16:05:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15221,13 +16476,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/lpr/Makefile.in kdelibs-3.4.0/kdeprint/lpr/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/lpr/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/lpr/Makefile.in 2005-03-04 20:41:35.001857267 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/lpr/Makefile.in kdelibs-3.4.0/kdeprint/lpr/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/lpr/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/lpr/Makefile.in 2005-03-18 16:05:08.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15303,13 +16559,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/management/Makefile.in kdelibs-3.4.0/kdeprint/management/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/management/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/management/Makefile.in 2005-03-04 20:41:35.277810155 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/management/Makefile.in kdelibs-3.4.0/kdeprint/management/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/management/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/management/Makefile.in 2005-03-18 16:05:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15607,13 +16864,14 @@
kmjobviewer.o: kmjobviewer.moc
kmpropcontainer.lo: kmpropcontainer.moc
kmwclass.o: kmwclass.moc
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/pics/Makefile.in kdelibs-3.4.0/kdeprint/pics/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/pics/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/pics/Makefile.in 2005-03-04 20:41:35.378792915 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/pics/Makefile.in kdelibs-3.4.0/kdeprint/pics/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/pics/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/pics/Makefile.in 2005-03-18 16:05:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15881,13 +17139,23 @@
#>+ 15
force-reedit:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/rlpr/Makefile.in kdelibs-3.4.0/kdeprint/rlpr/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/rlpr/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/rlpr/Makefile.in 2005-03-04 20:41:35.423785233 +0100
+@@ -844,7 +847,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/rlpr/Makefile.in kdelibs-3.4.0/kdeprint/rlpr/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/rlpr/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/rlpr/Makefile.in 2005-03-18 16:05:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15950,13 +17218,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/tests/Makefile.in kdelibs-3.4.0/kdeprint/tests/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/tests/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/tests/Makefile.in 2005-03-04 20:41:35.455779771 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/tests/Makefile.in kdelibs-3.4.0/kdeprint/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/tests/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/tests/Makefile.in 2005-03-18 16:05:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16019,13 +17288,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/tools/Makefile.in kdelibs-3.4.0/kdeprint/tools/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/tools/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/tools/Makefile.in 2005-03-04 20:41:35.464778235 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/tools/Makefile.in kdelibs-3.4.0/kdeprint/tools/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/tools/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/tools/Makefile.in 2005-03-18 16:05:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16113,13 +17383,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in
---- kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in 2005-03-04 20:41:35.491773626 +0100
+@@ -817,7 +832,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in
+--- kdelibs-3.4.0.orig/kdeprint/tools/escputil/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdeprint/tools/escputil/Makefile.in 2005-03-18 16:05:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16182,13 +17462,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdesu/Makefile.in kdelibs-3.4.0/kdesu/Makefile.in
---- kdelibs-3.4.0.orig/kdesu/Makefile.in 2005-03-04 14:23:15.000000000 +0100
-+++ kdelibs-3.4.0/kdesu/Makefile.in 2005-03-04 20:41:35.000000000 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdesu/Makefile.in kdelibs-3.4.0/kdesu/Makefile.in
+--- kdelibs-3.4.0.orig/kdesu/Makefile.in 2005-03-04 08:23:15.000000000 -0500
++++ kdelibs-3.4.0/kdesu/Makefile.in 2005-03-18 16:05:09.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16264,13 +17545,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeui/Makefile.in kdelibs-3.4.0/kdeui/Makefile.in
---- kdelibs-3.4.0.orig/kdeui/Makefile.in 2005-03-04 14:23:20.000000000 +0100
-+++ kdelibs-3.4.0/kdeui/Makefile.in 2005-03-04 20:41:39.978007709 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeui/Makefile.in kdelibs-3.4.0/kdeui/Makefile.in
+--- kdelibs-3.4.0.orig/kdeui/Makefile.in 2005-03-04 08:23:20.000000000 -0500
++++ kdelibs-3.4.0/kdeui/Makefile.in 2005-03-18 16:05:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16759,13 +18041,14 @@
@echo 'creating libkdeui_la.all_cpp.cpp ...'; \
rm -f libkdeui_la.all_cpp.files libkdeui_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeui_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeui/about/Makefile.in kdelibs-3.4.0/kdeui/about/Makefile.in
---- kdelibs-3.4.0.orig/kdeui/about/Makefile.in 2005-03-04 14:23:20.000000000 +0100
-+++ kdelibs-3.4.0/kdeui/about/Makefile.in 2005-03-04 20:41:40.303952062 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeui/about/Makefile.in kdelibs-3.4.0/kdeui/about/Makefile.in
+--- kdelibs-3.4.0.orig/kdeui/about/Makefile.in 2005-03-04 08:23:20.000000000 -0500
++++ kdelibs-3.4.0/kdeui/about/Makefile.in 2005-03-18 16:05:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16805,13 +18088,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeui/colors/Makefile.in kdelibs-3.4.0/kdeui/colors/Makefile.in
---- kdelibs-3.4.0.orig/kdeui/colors/Makefile.in 2005-03-04 14:23:20.000000000 +0100
-+++ kdelibs-3.4.0/kdeui/colors/Makefile.in 2005-03-04 20:41:40.542911265 +0100
+@@ -704,7 +707,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kdeui/colors/Makefile.in kdelibs-3.4.0/kdeui/colors/Makefile.in
+--- kdelibs-3.4.0.orig/kdeui/colors/Makefile.in 2005-03-04 08:23:20.000000000 -0500
++++ kdelibs-3.4.0/kdeui/colors/Makefile.in 2005-03-18 16:05:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16851,13 +18144,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in
---- kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in 2005-03-04 14:23:21.000000000 +0100
-+++ kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in 2005-03-04 20:41:41.070821137 +0100
+@@ -673,7 +676,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in
+--- kdelibs-3.4.0.orig/kdeui/kdetrayproxy/Makefile.in 2005-03-04 08:23:21.000000000 -0500
++++ kdelibs-3.4.0/kdeui/kdetrayproxy/Makefile.in 2005-03-18 16:05:13.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16920,13 +18223,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdeui/tests/Makefile.in kdelibs-3.4.0/kdeui/tests/Makefile.in
---- kdelibs-3.4.0.orig/kdeui/tests/Makefile.in 2005-03-04 14:23:21.000000000 +0100
-+++ kdelibs-3.4.0/kdeui/tests/Makefile.in 2005-03-04 20:41:41.848688334 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdeui/tests/Makefile.in kdelibs-3.4.0/kdeui/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kdeui/tests/Makefile.in 2005-03-04 08:23:21.000000000 -0500
++++ kdelibs-3.4.0/kdeui/tests/Makefile.in 2005-03-18 16:05:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17086,13 +18390,14 @@
kdesattest.lo: kdesattest.moc
kunbalancedgrdtest.lo: kunbalancedgrdtest.moc
kdocktest.o: kdocktest.moc
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdewidgets/Makefile.in kdelibs-3.4.0/kdewidgets/Makefile.in
---- kdelibs-3.4.0.orig/kdewidgets/Makefile.in 2005-03-04 14:23:21.000000000 +0100
-+++ kdelibs-3.4.0/kdewidgets/Makefile.in 2005-03-04 20:41:42.100645318 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdewidgets/Makefile.in kdelibs-3.4.0/kdewidgets/Makefile.in
+--- kdelibs-3.4.0.orig/kdewidgets/Makefile.in 2005-03-04 08:23:21.000000000 -0500
++++ kdelibs-3.4.0/kdewidgets/Makefile.in 2005-03-18 16:05:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17203,13 +18508,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdewidgets/pics/Makefile.in kdelibs-3.4.0/kdewidgets/pics/Makefile.in
---- kdelibs-3.4.0.orig/kdewidgets/pics/Makefile.in 2005-03-04 14:23:21.000000000 +0100
-+++ kdelibs-3.4.0/kdewidgets/pics/Makefile.in 2005-03-04 20:41:42.242621079 +0100
+diff -Nrua kdelibs-3.4.0.orig/kdewidgets/pics/Makefile.in kdelibs-3.4.0/kdewidgets/pics/Makefile.in
+--- kdelibs-3.4.0.orig/kdewidgets/pics/Makefile.in 2005-03-04 08:23:21.000000000 -0500
++++ kdelibs-3.4.0/kdewidgets/pics/Makefile.in 2005-03-18 16:05:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17258,13 +18564,23 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdewidgets/tests/Makefile.in kdelibs-3.4.0/kdewidgets/tests/Makefile.in
---- kdelibs-3.4.0.orig/kdewidgets/tests/Makefile.in 2005-03-04 14:23:21.000000000 +0100
-+++ kdelibs-3.4.0/kdewidgets/tests/Makefile.in 2005-03-04 20:41:42.498577380 +0100
+@@ -710,7 +713,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kdewidgets/tests/Makefile.in kdelibs-3.4.0/kdewidgets/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kdewidgets/tests/Makefile.in 2005-03-04 08:23:21.000000000 -0500
++++ kdelibs-3.4.0/kdewidgets/tests/Makefile.in 2005-03-18 16:05:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17304,13 +18620,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kdoctools/Makefile.in kdelibs-3.4.0/kdoctools/Makefile.in
---- kdelibs-3.4.0.orig/kdoctools/Makefile.in 2005-03-04 14:23:21.000000000 +0100
-+++ kdelibs-3.4.0/kdoctools/Makefile.in 2005-03-04 20:41:42.529572089 +0100
+@@ -694,7 +697,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kdoctools/Makefile.in kdelibs-3.4.0/kdoctools/Makefile.in
+--- kdelibs-3.4.0.orig/kdoctools/Makefile.in 2005-03-04 08:23:21.000000000 -0500
++++ kdelibs-3.4.0/kdoctools/Makefile.in 2005-03-18 16:05:14.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17373,13 +18699,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/Makefile.in kdelibs-3.4.0/khtml/Makefile.in
---- kdelibs-3.4.0.orig/khtml/Makefile.in 2005-03-04 14:23:24.000000000 +0100
-+++ kdelibs-3.4.0/khtml/Makefile.in 2005-03-04 20:41:46.065968328 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/Makefile.in kdelibs-3.4.0/khtml/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/Makefile.in 2005-03-04 08:23:24.000000000 -0500
++++ kdelibs-3.4.0/khtml/Makefile.in 2005-03-18 16:05:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17490,13 +18817,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/css/Makefile.in kdelibs-3.4.0/khtml/css/Makefile.in
---- kdelibs-3.4.0.orig/khtml/css/Makefile.in 2005-03-04 14:23:24.000000000 +0100
-+++ kdelibs-3.4.0/khtml/css/Makefile.in 2005-03-04 20:41:46.458901244 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/css/Makefile.in kdelibs-3.4.0/khtml/css/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/css/Makefile.in 2005-03-04 08:23:24.000000000 -0500
++++ kdelibs-3.4.0/khtml/css/Makefile.in 2005-03-18 16:05:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17568,13 +18896,14 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/dom/Makefile.in kdelibs-3.4.0/khtml/dom/Makefile.in
---- kdelibs-3.4.0.orig/khtml/dom/Makefile.in 2005-03-04 14:23:24.000000000 +0100
-+++ kdelibs-3.4.0/khtml/dom/Makefile.in 2005-03-04 20:41:46.905824941 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/dom/Makefile.in kdelibs-3.4.0/khtml/dom/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/dom/Makefile.in 2005-03-04 08:23:24.000000000 -0500
++++ kdelibs-3.4.0/khtml/dom/Makefile.in 2005-03-18 16:05:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17637,13 +18966,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/ecma/Makefile.in kdelibs-3.4.0/khtml/ecma/Makefile.in
---- kdelibs-3.4.0.orig/khtml/ecma/Makefile.in 2005-03-04 14:23:26.000000000 +0100
-+++ kdelibs-3.4.0/khtml/ecma/Makefile.in 2005-03-04 20:41:47.418737373 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/ecma/Makefile.in kdelibs-3.4.0/khtml/ecma/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/ecma/Makefile.in 2005-03-04 08:23:26.000000000 -0500
++++ kdelibs-3.4.0/khtml/ecma/Makefile.in 2005-03-18 16:05:17.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17706,13 +19036,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/html/Makefile.in kdelibs-3.4.0/khtml/html/Makefile.in
---- kdelibs-3.4.0.orig/khtml/html/Makefile.in 2005-03-04 14:23:27.000000000 +0100
-+++ kdelibs-3.4.0/khtml/html/Makefile.in 2005-03-04 20:41:47.549715011 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/html/Makefile.in kdelibs-3.4.0/khtml/html/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/html/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/html/Makefile.in 2005-03-18 16:05:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17775,13 +19106,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/java/Makefile.in kdelibs-3.4.0/khtml/java/Makefile.in
---- kdelibs-3.4.0.orig/khtml/java/Makefile.in 2005-03-04 14:23:27.000000000 +0100
-+++ kdelibs-3.4.0/khtml/java/Makefile.in 2005-03-04 20:41:47.663695551 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/java/Makefile.in kdelibs-3.4.0/khtml/java/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/java/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/java/Makefile.in 2005-03-18 16:05:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17944,13 +19276,14 @@
@echo 'creating libkjava_la.all_cpp.cpp ...'; \
rm -f libkjava_la.all_cpp.files libkjava_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkjava_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in kdelibs-3.4.0/khtml/java/dummy/Makefile.in
---- kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in 2005-03-04 14:23:27.000000000 +0100
-+++ kdelibs-3.4.0/khtml/java/dummy/Makefile.in 2005-03-04 20:41:47.693690430 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in kdelibs-3.4.0/khtml/java/dummy/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/java/dummy/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/java/dummy/Makefile.in 2005-03-18 16:05:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18013,13 +19346,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in kdelibs-3.4.0/khtml/java/tests/Makefile.in
---- kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in 2005-03-04 14:23:27.000000000 +0100
-+++ kdelibs-3.4.0/khtml/java/tests/Makefile.in 2005-03-04 20:41:47.705688382 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in kdelibs-3.4.0/khtml/java/tests/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/java/tests/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/java/tests/Makefile.in 2005-03-18 16:05:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18082,13 +19416,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in kdelibs-3.4.0/khtml/kmultipart/Makefile.in
---- kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in 2005-03-04 14:23:27.000000000 +0100
-+++ kdelibs-3.4.0/khtml/kmultipart/Makefile.in 2005-03-04 20:41:47.825667898 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in kdelibs-3.4.0/khtml/kmultipart/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/kmultipart/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/kmultipart/Makefile.in 2005-03-18 16:05:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18151,13 +19486,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/misc/Makefile.in kdelibs-3.4.0/khtml/misc/Makefile.in
---- kdelibs-3.4.0.orig/khtml/misc/Makefile.in 2005-03-04 14:23:27.000000000 +0100
-+++ kdelibs-3.4.0/khtml/misc/Makefile.in 2005-03-04 20:41:47.930649975 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/misc/Makefile.in kdelibs-3.4.0/khtml/misc/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/misc/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/misc/Makefile.in 2005-03-18 16:05:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18220,13 +19556,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/pics/Makefile.in kdelibs-3.4.0/khtml/pics/Makefile.in
---- kdelibs-3.4.0.orig/khtml/pics/Makefile.in 2005-03-04 14:23:27.000000000 +0100
-+++ kdelibs-3.4.0/khtml/pics/Makefile.in 2005-03-04 20:41:47.966643830 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/pics/Makefile.in kdelibs-3.4.0/khtml/pics/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/pics/Makefile.in 2005-03-04 08:23:27.000000000 -0500
++++ kdelibs-3.4.0/khtml/pics/Makefile.in 2005-03-18 16:05:18.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18329,13 +19666,23 @@
#>+ 15
force-reedit:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/rendering/Makefile.in kdelibs-3.4.0/khtml/rendering/Makefile.in
---- kdelibs-3.4.0.orig/khtml/rendering/Makefile.in 2005-03-04 14:23:28.000000000 +0100
-+++ kdelibs-3.4.0/khtml/rendering/Makefile.in 2005-03-04 20:41:48.440562918 +0100
+@@ -709,7 +712,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/khtml/rendering/Makefile.in kdelibs-3.4.0/khtml/rendering/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/rendering/Makefile.in 2005-03-04 08:23:28.000000000 -0500
++++ kdelibs-3.4.0/khtml/rendering/Makefile.in 2005-03-18 16:05:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18450,13 +19797,14 @@
+render_form.lo: render_form.moc
render_frames.lo: render_frames.moc
render_layer.lo: render_layer.moc
-diff -u -x debian -Nru kdelibs-3.4.0.orig/khtml/xml/Makefile.in kdelibs-3.4.0/khtml/xml/Makefile.in
---- kdelibs-3.4.0.orig/khtml/xml/Makefile.in 2005-03-04 14:23:28.000000000 +0100
-+++ kdelibs-3.4.0/khtml/xml/Makefile.in 2005-03-04 20:41:48.701518366 +0100
+diff -Nrua kdelibs-3.4.0.orig/khtml/xml/Makefile.in kdelibs-3.4.0/khtml/xml/Makefile.in
+--- kdelibs-3.4.0.orig/khtml/xml/Makefile.in 2005-03-04 08:23:28.000000000 -0500
++++ kdelibs-3.4.0/khtml/xml/Makefile.in 2005-03-18 16:05:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18519,13 +19867,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kimgio/Makefile.in kdelibs-3.4.0/kimgio/Makefile.in
---- kdelibs-3.4.0.orig/kimgio/Makefile.in 2005-03-04 14:23:28.000000000 +0100
-+++ kdelibs-3.4.0/kimgio/Makefile.in 2005-03-04 20:41:48.761508124 +0100
+diff -Nrua kdelibs-3.4.0.orig/kimgio/Makefile.in kdelibs-3.4.0/kimgio/Makefile.in
+--- kdelibs-3.4.0.orig/kimgio/Makefile.in 2005-03-04 08:23:28.000000000 -0500
++++ kdelibs-3.4.0/kimgio/Makefile.in 2005-03-18 16:05:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18588,13 +19937,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kinit/Makefile.in kdelibs-3.4.0/kinit/Makefile.in
---- kdelibs-3.4.0.orig/kinit/Makefile.in 2005-03-04 14:23:28.000000000 +0100
-+++ kdelibs-3.4.0/kinit/Makefile.in 2005-03-04 20:41:48.864490542 +0100
+diff -Nrua kdelibs-3.4.0.orig/kinit/Makefile.in kdelibs-3.4.0/kinit/Makefile.in
+--- kdelibs-3.4.0.orig/kinit/Makefile.in 2005-03-04 08:23:28.000000000 -0500
++++ kdelibs-3.4.0/kinit/Makefile.in 2005-03-18 16:05:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18718,13 +20068,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kinit/tests/Makefile.in kdelibs-3.4.0/kinit/tests/Makefile.in
---- kdelibs-3.4.0.orig/kinit/tests/Makefile.in 2005-03-04 14:23:28.000000000 +0100
-+++ kdelibs-3.4.0/kinit/tests/Makefile.in 2005-03-04 20:41:48.886486786 +0100
+diff -Nrua kdelibs-3.4.0.orig/kinit/tests/Makefile.in kdelibs-3.4.0/kinit/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kinit/tests/Makefile.in 2005-03-04 08:23:28.000000000 -0500
++++ kdelibs-3.4.0/kinit/tests/Makefile.in 2005-03-18 16:05:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18787,13 +20138,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/Makefile.in kdelibs-3.4.0/kio/Makefile.in
---- kdelibs-3.4.0.orig/kio/Makefile.in 2005-03-04 14:23:28.000000000 +0100
-+++ kdelibs-3.4.0/kio/Makefile.in 2005-03-04 20:41:48.906483372 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/Makefile.in kdelibs-3.4.0/kio/Makefile.in
+--- kdelibs-3.4.0.orig/kio/Makefile.in 2005-03-04 08:23:28.000000000 -0500
++++ kdelibs-3.4.0/kio/Makefile.in 2005-03-18 16:05:19.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18904,13 +20256,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/bookmarks/Makefile.in kdelibs-3.4.0/kio/bookmarks/Makefile.in
---- kdelibs-3.4.0.orig/kio/bookmarks/Makefile.in 2005-03-04 14:23:28.000000000 +0100
-+++ kdelibs-3.4.0/kio/bookmarks/Makefile.in 2005-03-04 20:41:49.029462376 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/bookmarks/Makefile.in kdelibs-3.4.0/kio/bookmarks/Makefile.in
+--- kdelibs-3.4.0.orig/kio/bookmarks/Makefile.in 2005-03-04 08:23:28.000000000 -0500
++++ kdelibs-3.4.0/kio/bookmarks/Makefile.in 2005-03-18 16:05:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18973,13 +20326,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/httpfilter/Makefile.in kdelibs-3.4.0/kio/httpfilter/Makefile.in
---- kdelibs-3.4.0.orig/kio/httpfilter/Makefile.in 2005-03-04 14:23:29.000000000 +0100
-+++ kdelibs-3.4.0/kio/httpfilter/Makefile.in 2005-03-04 20:41:49.052458450 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/httpfilter/Makefile.in kdelibs-3.4.0/kio/httpfilter/Makefile.in
+--- kdelibs-3.4.0.orig/kio/httpfilter/Makefile.in 2005-03-04 08:23:29.000000000 -0500
++++ kdelibs-3.4.0/kio/httpfilter/Makefile.in 2005-03-18 16:05:20.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19042,13 +20396,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/kfile/Makefile.in kdelibs-3.4.0/kio/kfile/Makefile.in
---- kdelibs-3.4.0.orig/kio/kfile/Makefile.in 2005-03-04 14:23:31.000000000 +0100
-+++ kdelibs-3.4.0/kio/kfile/Makefile.in 2005-03-04 20:41:49.776334864 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/kfile/Makefile.in kdelibs-3.4.0/kio/kfile/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kfile/Makefile.in 2005-03-04 08:23:31.000000000 -0500
++++ kdelibs-3.4.0/kio/kfile/Makefile.in 2005-03-18 16:05:21.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19273,13 +20628,14 @@
@echo 'creating libkfile_la.all_cpp.cpp ...'; \
rm -f libkfile_la.all_cpp.files libkfile_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkfile_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/kfile/tests/Makefile.in kdelibs-3.4.0/kio/kfile/tests/Makefile.in
---- kdelibs-3.4.0.orig/kio/kfile/tests/Makefile.in 2005-03-04 14:23:31.000000000 +0100
-+++ kdelibs-3.4.0/kio/kfile/tests/Makefile.in 2005-03-04 20:41:49.817327865 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/kfile/tests/Makefile.in kdelibs-3.4.0/kio/kfile/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kfile/tests/Makefile.in 2005-03-04 08:23:31.000000000 -0500
++++ kdelibs-3.4.0/kio/kfile/tests/Makefile.in 2005-03-18 16:05:22.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19342,13 +20698,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/kio/Makefile.in kdelibs-3.4.0/kio/kio/Makefile.in
---- kdelibs-3.4.0.orig/kio/kio/Makefile.in 2005-03-04 14:23:33.000000000 +0100
-+++ kdelibs-3.4.0/kio/kio/Makefile.in 2005-03-04 20:41:52.545862025 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/kio/Makefile.in kdelibs-3.4.0/kio/kio/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kio/Makefile.in 2005-03-04 08:23:33.000000000 -0500
++++ kdelibs-3.4.0/kio/kio/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19661,13 +21018,14 @@
kshellcompletion.o: kshellcompletion.moc
dataslave.lo: dataslave.moc
$(srcdir)/tcpslavebase.cpp: observer_stub.h uiserver_stub.h
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/kioexec/Makefile.in kdelibs-3.4.0/kio/kioexec/Makefile.in
---- kdelibs-3.4.0.orig/kio/kioexec/Makefile.in 2005-03-04 14:23:33.000000000 +0100
-+++ kdelibs-3.4.0/kio/kioexec/Makefile.in 2005-03-04 20:41:52.623848710 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/kioexec/Makefile.in kdelibs-3.4.0/kio/kioexec/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kioexec/Makefile.in 2005-03-04 08:23:33.000000000 -0500
++++ kdelibs-3.4.0/kio/kioexec/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19730,13 +21088,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/kpasswdserver/Makefile.in kdelibs-3.4.0/kio/kpasswdserver/Makefile.in
---- kdelibs-3.4.0.orig/kio/kpasswdserver/Makefile.in 2005-03-04 14:23:33.000000000 +0100
-+++ kdelibs-3.4.0/kio/kpasswdserver/Makefile.in 2005-03-04 20:41:52.705834713 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/kpasswdserver/Makefile.in kdelibs-3.4.0/kio/kpasswdserver/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kpasswdserver/Makefile.in 2005-03-04 08:23:33.000000000 -0500
++++ kdelibs-3.4.0/kio/kpasswdserver/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19799,13 +21158,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/Makefile.in
---- kdelibs-3.4.0.orig/kio/kssl/Makefile.in 2005-03-04 14:23:33.000000000 +0100
-+++ kdelibs-3.4.0/kio/kssl/Makefile.in 2005-03-04 20:41:52.820815083 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kssl/Makefile.in 2005-03-04 08:23:33.000000000 -0500
++++ kdelibs-3.4.0/kio/kssl/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19847,6 +21207,15 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
+@@ -527,7 +530,7 @@
+ # somewhere else. Another option for the future (needs testing) would be to
+ # change SSL_INCLUDES to .../include/openssl and make the source use #include <foo.h>
+ # instead of #include <openssl/foo.h>
+-INCLUDES = -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
++INCLUDES = -I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kwallet/client $(all_includes) $(SSL_INCLUDES)
+ noinst_LTLIBRARIES = libkssl.la
+ KSSLVERSION = 3.0.0
+ KSSLPATCH = 0
@@ -621,7 +624,7 @@
.SUFFIXES:
@@ -19925,13 +21294,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/kssl/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/Makefile.in
---- kdelibs-3.4.0.orig/kio/kssl/kssl/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/kssl/kssl/Makefile.in 2005-03-04 20:41:52.830813376 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/kssl/kssl/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kssl/kssl/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/kssl/kssl/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20019,13 +21389,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in
---- kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in 2005-03-04 20:41:52.838812010 +0100
+@@ -850,7 +865,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in
+--- kdelibs-3.4.0.orig/kio/kssl/kssl/caroot/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/kssl/kssl/caroot/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20065,13 +21445,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/misc/Makefile.in kdelibs-3.4.0/kio/misc/Makefile.in
---- kdelibs-3.4.0.orig/kio/misc/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/misc/Makefile.in 2005-03-04 20:41:52.904800744 +0100
+@@ -697,7 +700,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kio/misc/Makefile.in kdelibs-3.4.0/kio/misc/Makefile.in
+--- kdelibs-3.4.0.orig/kio/misc/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20182,13 +21572,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/misc/kdesasl/Makefile.in kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in
---- kdelibs-3.4.0.orig/kio/misc/kdesasl/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in 2005-03-04 20:41:52.939794769 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/misc/kdesasl/Makefile.in kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in
+--- kdelibs-3.4.0.orig/kio/misc/kdesasl/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kdesasl/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20251,13 +21642,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/misc/kfile/Makefile.in kdelibs-3.4.0/kio/misc/kfile/Makefile.in
---- kdelibs-3.4.0.orig/kio/misc/kfile/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/misc/kfile/Makefile.in 2005-03-04 20:41:53.203749704 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/misc/kfile/Makefile.in kdelibs-3.4.0/kio/misc/kfile/Makefile.in
+--- kdelibs-3.4.0.orig/kio/misc/kfile/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kfile/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20320,13 +21712,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/misc/kntlm/Makefile.in kdelibs-3.4.0/kio/misc/kntlm/Makefile.in
---- kdelibs-3.4.0.orig/kio/misc/kntlm/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/misc/kntlm/Makefile.in 2005-03-04 20:41:53.259740145 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/misc/kntlm/Makefile.in kdelibs-3.4.0/kio/misc/kntlm/Makefile.in
+--- kdelibs-3.4.0.orig/kio/misc/kntlm/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kntlm/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20389,13 +21782,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/misc/kpac/Makefile.in kdelibs-3.4.0/kio/misc/kpac/Makefile.in
---- kdelibs-3.4.0.orig/kio/misc/kpac/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/misc/kpac/Makefile.in 2005-03-04 20:41:53.299733317 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/misc/kpac/Makefile.in kdelibs-3.4.0/kio/misc/kpac/Makefile.in
+--- kdelibs-3.4.0.orig/kio/misc/kpac/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kpac/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20510,13 +21904,14 @@
@echo 'creating kded_proxyscout_la.all_cpp.cpp ...'; \
rm -f kded_proxyscout_la.all_cpp.files kded_proxyscout_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kded_proxyscout_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/misc/ksendbugmail/Makefile.in kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in
---- kdelibs-3.4.0.orig/kio/misc/ksendbugmail/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in 2005-03-04 20:41:53.336727001 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/misc/ksendbugmail/Makefile.in kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in
+--- kdelibs-3.4.0.orig/kio/misc/ksendbugmail/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/ksendbugmail/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20579,13 +21974,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/misc/kssld/Makefile.in kdelibs-3.4.0/kio/misc/kssld/Makefile.in
---- kdelibs-3.4.0.orig/kio/misc/kssld/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/misc/kssld/Makefile.in 2005-03-04 20:41:53.376720173 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/misc/kssld/Makefile.in kdelibs-3.4.0/kio/misc/kssld/Makefile.in
+--- kdelibs-3.4.0.orig/kio/misc/kssld/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kssld/Makefile.in 2005-03-18 16:05:24.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20648,13 +22044,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/misc/kwalletd/Makefile.in kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in
---- kdelibs-3.4.0.orig/kio/misc/kwalletd/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in 2005-03-04 20:41:53.944623215 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/misc/kwalletd/Makefile.in kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in
+--- kdelibs-3.4.0.orig/kio/misc/kwalletd/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/misc/kwalletd/Makefile.in 2005-03-18 16:05:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20717,13 +22114,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/pics/Makefile.in kdelibs-3.4.0/kio/pics/Makefile.in
---- kdelibs-3.4.0.orig/kio/pics/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/pics/Makefile.in 2005-03-04 20:41:53.953621679 +0100
+diff -Nrua kdelibs-3.4.0.orig/kio/pics/Makefile.in kdelibs-3.4.0/kio/pics/Makefile.in
+--- kdelibs-3.4.0.orig/kio/pics/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/pics/Makefile.in 2005-03-18 16:05:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20763,13 +22161,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kio/tests/Makefile.in kdelibs-3.4.0/kio/tests/Makefile.in
---- kdelibs-3.4.0.orig/kio/tests/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kio/tests/Makefile.in 2005-03-04 20:41:54.046605804 +0100
+@@ -678,7 +681,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kio/tests/Makefile.in kdelibs-3.4.0/kio/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kio/tests/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kio/tests/Makefile.in 2005-03-18 16:05:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20832,13 +22240,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kioslave/Makefile.in kdelibs-3.4.0/kioslave/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kioslave/Makefile.in 2005-03-04 20:41:54.056604097 +0100
+diff -Nrua kdelibs-3.4.0.orig/kioslave/Makefile.in kdelibs-3.4.0/kioslave/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/Makefile.in 2005-03-18 16:05:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20926,13 +22335,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in kdelibs-3.4.0/kioslave/bzip2/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kioslave/bzip2/Makefile.in 2005-03-04 20:41:54.070601707 +0100
+@@ -838,7 +853,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in kdelibs-3.4.0/kioslave/bzip2/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/bzip2/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/bzip2/Makefile.in 2005-03-18 16:05:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20995,13 +22414,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kioslave/file/Makefile.in kdelibs-3.4.0/kioslave/file/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/file/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kioslave/file/Makefile.in 2005-03-04 20:41:54.124592489 +0100
+diff -Nrua kdelibs-3.4.0.orig/kioslave/file/Makefile.in kdelibs-3.4.0/kioslave/file/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/file/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/file/Makefile.in 2005-03-18 16:05:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21064,13 +22484,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in kdelibs-3.4.0/kioslave/ftp/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kioslave/ftp/Makefile.in 2005-03-04 20:41:54.137590270 +0100
+diff -Nrua kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in kdelibs-3.4.0/kioslave/ftp/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/ftp/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/ftp/Makefile.in 2005-03-18 16:05:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21133,13 +22554,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in kdelibs-3.4.0/kioslave/gzip/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in 2005-03-04 14:23:34.000000000 +0100
-+++ kdelibs-3.4.0/kioslave/gzip/Makefile.in 2005-03-04 20:41:54.152587710 +0100
+diff -Nrua kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in kdelibs-3.4.0/kioslave/gzip/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/gzip/Makefile.in 2005-03-04 08:23:34.000000000 -0500
++++ kdelibs-3.4.0/kioslave/gzip/Makefile.in 2005-03-18 16:05:25.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21202,13 +22624,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kioslave/http/Makefile.in kdelibs-3.4.0/kioslave/http/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/http/Makefile.in 2005-03-04 14:23:35.000000000 +0100
-+++ kdelibs-3.4.0/kioslave/http/Makefile.in 2005-03-04 20:41:54.930454904 +0100
+diff -Nrua kdelibs-3.4.0.orig/kioslave/http/Makefile.in kdelibs-3.4.0/kioslave/http/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/http/Makefile.in 2005-03-04 08:23:35.000000000 -0500
++++ kdelibs-3.4.0/kioslave/http/Makefile.in 2005-03-18 16:05:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21319,13 +22742,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kioslave/http/kcookiejar/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/http/kcookiejar/Makefile.in 2005-03-04 14:23:35.000000000 +0100
-+++ kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in 2005-03-04 20:41:54.959449954 +0100
+diff -Nrua kdelibs-3.4.0.orig/kioslave/http/kcookiejar/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/http/kcookiejar/Makefile.in 2005-03-04 08:23:35.000000000 -0500
++++ kdelibs-3.4.0/kioslave/http/kcookiejar/Makefile.in 2005-03-18 16:05:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21486,13 +22910,14 @@
-kcookiewin.o: kcookiewin.moc
kcookieserver.o: kcookieserver.moc
+kcookiewin.o: kcookiewin.moc
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kioslave/http/kcookiejar/tests/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/http/kcookiejar/tests/Makefile.in 2005-03-04 14:23:35.000000000 +0100
-+++ kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in 2005-03-04 20:41:54.972447735 +0100
+diff -Nrua kdelibs-3.4.0.orig/kioslave/http/kcookiejar/tests/Makefile.in kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/http/kcookiejar/tests/Makefile.in 2005-03-04 08:23:35.000000000 -0500
++++ kdelibs-3.4.0/kioslave/http/kcookiejar/tests/Makefile.in 2005-03-18 16:05:26.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21555,13 +22980,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kioslave/metainfo/Makefile.in kdelibs-3.4.0/kioslave/metainfo/Makefile.in
---- kdelibs-3.4.0.orig/kioslave/metainfo/Makefile.in 2005-03-04 14:23:35.000000000 +0100
-+++ kdelibs-3.4.0/kioslave/metainfo/Makefile.in 2005-03-04 20:41:54.985445516 +0100
+diff -Nrua kdelibs-3.4.0.orig/kioslave/metainfo/Makefile.in kdelibs-3.4.0/kioslave/metainfo/Makefile.in
+--- kdelibs-3.4.0.orig/kioslave/metainfo/Makefile.in 2005-03-04 08:23:35.000000000 -0500
++++ kdelibs-3.4.0/kioslave/metainfo/Makefile.in 2005-03-18 16:05:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21624,13 +23050,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kjs/Makefile.in kdelibs-3.4.0/kjs/Makefile.in
---- kdelibs-3.4.0.orig/kjs/Makefile.in 2005-03-04 14:23:35.000000000 +0100
-+++ kdelibs-3.4.0/kjs/Makefile.in 2005-03-04 20:41:55.009441419 +0100
+diff -Nrua kdelibs-3.4.0.orig/kjs/Makefile.in kdelibs-3.4.0/kjs/Makefile.in
+--- kdelibs-3.4.0.orig/kjs/Makefile.in 2005-03-04 08:23:35.000000000 -0500
++++ kdelibs-3.4.0/kjs/Makefile.in 2005-03-18 16:05:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21693,13 +23120,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
global.h: $(top_builddir)/config.status $(srcdir)/global.h.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kmdi/Makefile.in kdelibs-3.4.0/kmdi/Makefile.in
---- kdelibs-3.4.0.orig/kmdi/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kmdi/Makefile.in 2005-03-04 20:41:55.212406767 +0100
+diff -Nrua kdelibs-3.4.0.orig/kmdi/Makefile.in kdelibs-3.4.0/kmdi/Makefile.in
+--- kdelibs-3.4.0.orig/kmdi/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kmdi/Makefile.in 2005-03-18 16:05:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21849,13 +23277,14 @@
@echo 'creating libkmdi_la.all_cpp.cpp ...'; \
rm -f libkmdi_la.all_cpp.files libkmdi_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmdi_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in kdelibs-3.4.0/kmdi/kmdi/Makefile.in
---- kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kmdi/kmdi/Makefile.in 2005-03-04 20:41:55.277395671 +0100
+diff -Nrua kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in kdelibs-3.4.0/kmdi/kmdi/Makefile.in
+--- kdelibs-3.4.0.orig/kmdi/kmdi/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kmdi/kmdi/Makefile.in 2005-03-18 16:05:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21918,13 +23347,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kmdi/test/Makefile.in kdelibs-3.4.0/kmdi/test/Makefile.in
---- kdelibs-3.4.0.orig/kmdi/test/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kmdi/test/Makefile.in 2005-03-04 20:41:55.328386965 +0100
+diff -Nrua kdelibs-3.4.0.orig/kmdi/test/Makefile.in kdelibs-3.4.0/kmdi/test/Makefile.in
+--- kdelibs-3.4.0.orig/kmdi/test/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kmdi/test/Makefile.in 2005-03-18 16:05:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21987,13 +23417,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/knewstuff/Makefile.in kdelibs-3.4.0/knewstuff/Makefile.in
---- kdelibs-3.4.0.orig/knewstuff/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/knewstuff/Makefile.in 2005-03-04 20:41:55.388376723 +0100
+diff -Nrua kdelibs-3.4.0.orig/knewstuff/Makefile.in kdelibs-3.4.0/knewstuff/Makefile.in
+--- kdelibs-3.4.0.orig/knewstuff/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/knewstuff/Makefile.in 2005-03-18 16:05:27.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22119,13 +23550,14 @@
@echo 'creating libknewstuff_la.all_cpp.cpp ...'; \
rm -f libknewstuff_la.all_cpp.files libknewstuff_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libknewstuff_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kparts/Makefile.in kdelibs-3.4.0/kparts/Makefile.in
---- kdelibs-3.4.0.orig/kparts/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kparts/Makefile.in 2005-03-04 20:41:55.431369383 +0100
+diff -Nrua kdelibs-3.4.0.orig/kparts/Makefile.in kdelibs-3.4.0/kparts/Makefile.in
+--- kdelibs-3.4.0.orig/kparts/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kparts/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22231,13 +23663,14 @@
@echo 'creating libkparts_la.all_cpp.cpp ...'; \
rm -f libkparts_la.all_cpp.files libkparts_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkparts_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kparts/tests/Makefile.in kdelibs-3.4.0/kparts/tests/Makefile.in
---- kdelibs-3.4.0.orig/kparts/tests/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kparts/tests/Makefile.in 2005-03-04 20:41:55.455365286 +0100
+diff -Nrua kdelibs-3.4.0.orig/kparts/tests/Makefile.in kdelibs-3.4.0/kparts/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kparts/tests/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kparts/tests/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22300,13 +23733,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kresources/Makefile.in kdelibs-3.4.0/kresources/Makefile.in
---- kdelibs-3.4.0.orig/kresources/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kresources/Makefile.in 2005-03-04 20:41:55.485360165 +0100
+diff -Nrua kdelibs-3.4.0.orig/kresources/Makefile.in kdelibs-3.4.0/kresources/Makefile.in
+--- kdelibs-3.4.0.orig/kresources/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kresources/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22403,13 +23837,14 @@
#>+ 2
KDE_DIST=kcmkresources.h Makefile.in kresources.desktop kresources_manager.desktop README.design kresources_plugin.desktop Makefile.am
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kspell2/Makefile.in kdelibs-3.4.0/kspell2/Makefile.in
---- kdelibs-3.4.0.orig/kspell2/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kspell2/Makefile.in 2005-03-04 20:41:55.505356751 +0100
+diff -Nrua kdelibs-3.4.0.orig/kspell2/Makefile.in kdelibs-3.4.0/kspell2/Makefile.in
+--- kdelibs-3.4.0.orig/kspell2/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kspell2/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22573,13 +24008,14 @@
backgroundengine.lo: backgroundengine.moc
client.o: client.moc
backgroundchecker.lo: backgroundchecker.moc
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in kdelibs-3.4.0/kspell2/plugins/Makefile.in
---- kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kspell2/plugins/Makefile.in 2005-03-04 20:41:55.514355215 +0100
+diff -Nrua kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in kdelibs-3.4.0/kspell2/plugins/Makefile.in
+--- kdelibs-3.4.0.orig/kspell2/plugins/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kspell2/plugins/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22667,13 +24103,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kspell2/plugins/aspell/Makefile.in kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in
---- kdelibs-3.4.0.orig/kspell2/plugins/aspell/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in 2005-03-04 20:41:55.548349411 +0100
+@@ -818,7 +833,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kspell2/plugins/aspell/Makefile.in kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in
+--- kdelibs-3.4.0.orig/kspell2/plugins/aspell/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kspell2/plugins/aspell/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22736,13 +24182,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kspell2/plugins/ispell/Makefile.in kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in
---- kdelibs-3.4.0.orig/kspell2/plugins/ispell/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in 2005-03-04 20:41:55.619337292 +0100
+diff -Nrua kdelibs-3.4.0.orig/kspell2/plugins/ispell/Makefile.in kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in
+--- kdelibs-3.4.0.orig/kspell2/plugins/ispell/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kspell2/plugins/ispell/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22805,13 +24252,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kspell2/tests/Makefile.in kdelibs-3.4.0/kspell2/tests/Makefile.in
---- kdelibs-3.4.0.orig/kspell2/tests/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kspell2/tests/Makefile.in 2005-03-04 20:41:55.662329951 +0100
+diff -Nrua kdelibs-3.4.0.orig/kspell2/tests/Makefile.in kdelibs-3.4.0/kspell2/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kspell2/tests/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kspell2/tests/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22874,13 +24322,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kspell2/ui/Makefile.in kdelibs-3.4.0/kspell2/ui/Makefile.in
---- kdelibs-3.4.0.orig/kspell2/ui/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kspell2/ui/Makefile.in 2005-03-04 20:41:55.712321416 +0100
+diff -Nrua kdelibs-3.4.0.orig/kspell2/ui/Makefile.in kdelibs-3.4.0/kspell2/ui/Makefile.in
+--- kdelibs-3.4.0.orig/kspell2/ui/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kspell2/ui/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22943,13 +24392,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/Makefile.in kdelibs-3.4.0/kstyles/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/Makefile.in 2005-03-04 20:41:55.721319880 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/Makefile.in kdelibs-3.4.0/kstyles/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kstyles/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23037,13 +24487,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/highcolor/Makefile.in kdelibs-3.4.0/kstyles/highcolor/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/highcolor/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/highcolor/Makefile.in 2005-03-04 20:41:55.754314247 +0100
+@@ -817,7 +832,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kstyles/highcolor/Makefile.in kdelibs-3.4.0/kstyles/highcolor/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/highcolor/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kstyles/highcolor/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23106,13 +24566,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/highcontrast/Makefile.in kdelibs-3.4.0/kstyles/highcontrast/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/highcontrast/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/highcontrast/Makefile.in 2005-03-04 20:41:55.788308443 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/highcontrast/Makefile.in kdelibs-3.4.0/kstyles/highcontrast/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/highcontrast/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kstyles/highcontrast/Makefile.in 2005-03-18 16:05:28.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23175,13 +24636,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/keramik/Makefile.in kdelibs-3.4.0/kstyles/keramik/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/keramik/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/keramik/Makefile.in 2005-03-04 20:41:56.343213704 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/keramik/Makefile.in kdelibs-3.4.0/kstyles/keramik/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/keramik/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kstyles/keramik/Makefile.in 2005-03-18 16:05:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23244,13 +24706,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/klegacy/Makefile.in kdelibs-3.4.0/kstyles/klegacy/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/klegacy/Makefile.in 2005-03-04 14:23:36.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/klegacy/Makefile.in 2005-03-04 20:41:56.438197487 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/klegacy/Makefile.in kdelibs-3.4.0/kstyles/klegacy/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/klegacy/Makefile.in 2005-03-04 08:23:36.000000000 -0500
++++ kdelibs-3.4.0/kstyles/klegacy/Makefile.in 2005-03-18 16:05:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23313,13 +24776,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/kthemestyle/Makefile.in kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/kthemestyle/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in 2005-03-04 20:41:56.742145594 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/kthemestyle/Makefile.in kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/kthemestyle/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/kthemestyle/Makefile.in 2005-03-18 16:05:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23382,13 +24846,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/light/Makefile.in kdelibs-3.4.0/kstyles/light/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/light/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/light/Makefile.in 2005-03-04 20:41:57.281053586 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/light/Makefile.in kdelibs-3.4.0/kstyles/light/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/light/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/light/Makefile.in 2005-03-18 16:05:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23451,13 +24916,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in kdelibs-3.4.0/kstyles/plastik/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/plastik/Makefile.in 2005-03-04 20:41:57.315047782 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in kdelibs-3.4.0/kstyles/plastik/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/plastik/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/plastik/Makefile.in 2005-03-18 16:05:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23568,13 +25034,14 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/plastik/config/Makefile.in kdelibs-3.4.0/kstyles/plastik/config/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/plastik/config/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/plastik/config/Makefile.in 2005-03-04 20:41:57.355040954 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/plastik/config/Makefile.in kdelibs-3.4.0/kstyles/plastik/config/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/plastik/config/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/plastik/config/Makefile.in 2005-03-18 16:05:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23637,13 +25104,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/riscos/Makefile.in kdelibs-3.4.0/kstyles/riscos/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/riscos/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/riscos/Makefile.in 2005-03-04 20:41:57.375037540 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/riscos/Makefile.in kdelibs-3.4.0/kstyles/riscos/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/riscos/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/riscos/Makefile.in 2005-03-18 16:05:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23683,13 +25151,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/themes/Makefile.in kdelibs-3.4.0/kstyles/themes/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/themes/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/themes/Makefile.in 2005-03-04 20:41:57.402032931 +0100
+@@ -752,7 +755,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kstyles/themes/Makefile.in kdelibs-3.4.0/kstyles/themes/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/themes/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/themes/Makefile.in 2005-03-18 16:05:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23729,13 +25207,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/utils/Makefile.in kdelibs-3.4.0/kstyles/utils/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/utils/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/utils/Makefile.in 2005-03-04 20:41:57.418030200 +0100
+@@ -725,7 +728,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kstyles/utils/Makefile.in kdelibs-3.4.0/kstyles/utils/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/utils/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/utils/Makefile.in 2005-03-18 16:05:29.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23823,13 +25311,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in 2005-03-04 20:41:57.437026957 +0100
+@@ -817,7 +832,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/utils/installtheme/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/utils/installtheme/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23892,13 +25390,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kstyles/web/Makefile.in kdelibs-3.4.0/kstyles/web/Makefile.in
---- kdelibs-3.4.0.orig/kstyles/web/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kstyles/web/Makefile.in 2005-03-04 20:41:57.462022689 +0100
+diff -Nrua kdelibs-3.4.0.orig/kstyles/web/Makefile.in kdelibs-3.4.0/kstyles/web/Makefile.in
+--- kdelibs-3.4.0.orig/kstyles/web/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kstyles/web/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23961,13 +25460,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kutils/Makefile.in kdelibs-3.4.0/kutils/Makefile.in
---- kdelibs-3.4.0.orig/kutils/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kutils/Makefile.in 2005-03-04 20:41:57.550007668 +0100
+diff -Nrua kdelibs-3.4.0.orig/kutils/Makefile.in kdelibs-3.4.0/kutils/Makefile.in
+--- kdelibs-3.4.0.orig/kutils/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kutils/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24121,13 +25621,14 @@
@echo 'creating libkutils_la.all_cpp.cpp ...'; \
rm -f libkutils_la.all_cpp.files libkutils_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkutils_la.all_cpp.final; \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in kdelibs-3.4.0/kutils/ksettings/Makefile.in
---- kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kutils/ksettings/Makefile.in 2005-03-04 20:41:57.572003912 +0100
+diff -Nrua kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in kdelibs-3.4.0/kutils/ksettings/Makefile.in
+--- kdelibs-3.4.0.orig/kutils/ksettings/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kutils/ksettings/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24190,13 +25691,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kutils/tests/Makefile.in kdelibs-3.4.0/kutils/tests/Makefile.in
---- kdelibs-3.4.0.orig/kutils/tests/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kutils/tests/Makefile.in 2005-03-04 20:41:57.591000669 +0100
+diff -Nrua kdelibs-3.4.0.orig/kutils/tests/Makefile.in kdelibs-3.4.0/kutils/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kutils/tests/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kutils/tests/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24259,13 +25761,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kwallet/Makefile.in kdelibs-3.4.0/kwallet/Makefile.in
---- kdelibs-3.4.0.orig/kwallet/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kwallet/Makefile.in 2005-03-04 20:41:57.608997596 +0100
+diff -Nrua kdelibs-3.4.0.orig/kwallet/Makefile.in kdelibs-3.4.0/kwallet/Makefile.in
+--- kdelibs-3.4.0.orig/kwallet/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kwallet/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24353,13 +25856,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kwallet/backend/Makefile.in kdelibs-3.4.0/kwallet/backend/Makefile.in
---- kdelibs-3.4.0.orig/kwallet/backend/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kwallet/backend/Makefile.in 2005-03-04 20:41:57.797965334 +0100
+@@ -997,7 +1012,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/kwallet/backend/Makefile.in kdelibs-3.4.0/kwallet/backend/Makefile.in
+--- kdelibs-3.4.0.orig/kwallet/backend/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kwallet/backend/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24422,13 +25935,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kwallet/backend/tests/Makefile.in kdelibs-3.4.0/kwallet/backend/tests/Makefile.in
---- kdelibs-3.4.0.orig/kwallet/backend/tests/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kwallet/backend/tests/Makefile.in 2005-03-04 20:41:57.971935632 +0100
+diff -Nrua kdelibs-3.4.0.orig/kwallet/backend/tests/Makefile.in kdelibs-3.4.0/kwallet/backend/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kwallet/backend/tests/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kwallet/backend/tests/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24491,13 +26005,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kwallet/client/Makefile.in kdelibs-3.4.0/kwallet/client/Makefile.in
---- kdelibs-3.4.0.orig/kwallet/client/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kwallet/client/Makefile.in 2005-03-04 20:41:58.248888347 +0100
+diff -Nrua kdelibs-3.4.0.orig/kwallet/client/Makefile.in kdelibs-3.4.0/kwallet/client/Makefile.in
+--- kdelibs-3.4.0.orig/kwallet/client/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kwallet/client/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24560,13 +26075,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/kwallet/tests/Makefile.in kdelibs-3.4.0/kwallet/tests/Makefile.in
---- kdelibs-3.4.0.orig/kwallet/tests/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/kwallet/tests/Makefile.in 2005-03-04 20:41:58.416859670 +0100
+diff -Nrua kdelibs-3.4.0.orig/kwallet/tests/Makefile.in kdelibs-3.4.0/kwallet/tests/Makefile.in
+--- kdelibs-3.4.0.orig/kwallet/tests/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/kwallet/tests/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24629,13 +26145,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/libkmid/Makefile.in kdelibs-3.4.0/libkmid/Makefile.in
---- kdelibs-3.4.0.orig/libkmid/Makefile.in 2005-03-04 14:23:37.000000000 +0100
-+++ kdelibs-3.4.0/libkmid/Makefile.in 2005-03-04 20:41:58.569833552 +0100
+diff -Nrua kdelibs-3.4.0.orig/libkmid/Makefile.in kdelibs-3.4.0/libkmid/Makefile.in
+--- kdelibs-3.4.0.orig/libkmid/Makefile.in 2005-03-04 08:23:37.000000000 -0500
++++ kdelibs-3.4.0/libkmid/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24698,13 +26215,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/libkmid/tests/Makefile.in kdelibs-3.4.0/libkmid/tests/Makefile.in
---- kdelibs-3.4.0.orig/libkmid/tests/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/libkmid/tests/Makefile.in 2005-03-04 20:41:58.638821774 +0100
+diff -Nrua kdelibs-3.4.0.orig/libkmid/tests/Makefile.in kdelibs-3.4.0/libkmid/tests/Makefile.in
+--- kdelibs-3.4.0.orig/libkmid/tests/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/libkmid/tests/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24780,13 +26298,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/libkscreensaver/Makefile.in kdelibs-3.4.0/libkscreensaver/Makefile.in
---- kdelibs-3.4.0.orig/libkscreensaver/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/libkscreensaver/Makefile.in 2005-03-04 20:41:58.654819043 +0100
+diff -Nrua kdelibs-3.4.0.orig/libkscreensaver/Makefile.in kdelibs-3.4.0/libkscreensaver/Makefile.in
+--- kdelibs-3.4.0.orig/libkscreensaver/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/libkscreensaver/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24849,13 +26368,14 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -x debian -Nru kdelibs-3.4.0.orig/libltdl/Makefile.in kdelibs-3.4.0/libltdl/Makefile.in
---- kdelibs-3.4.0.orig/libltdl/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/libltdl/Makefile.in 2005-03-04 20:41:58.856784561 +0100
+diff -Nrua kdelibs-3.4.0.orig/libltdl/Makefile.in kdelibs-3.4.0/libltdl/Makefile.in
+--- kdelibs-3.4.0.orig/libltdl/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/libltdl/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24909,13 +26429,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/licenses/Makefile.in kdelibs-3.4.0/licenses/Makefile.in
---- kdelibs-3.4.0.orig/licenses/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/licenses/Makefile.in 2005-03-04 20:41:58.865783025 +0100
+@@ -776,7 +779,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/licenses/Makefile.in kdelibs-3.4.0/licenses/Makefile.in
+--- kdelibs-3.4.0.orig/licenses/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/licenses/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24955,13 +26485,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/Makefile.in kdelibs-3.4.0/mimetypes/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/Makefile.in 2005-03-04 20:41:58.894778074 +0100
+@@ -697,7 +700,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/Makefile.in kdelibs-3.4.0/mimetypes/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25049,13 +26589,23 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/application/Makefile.in kdelibs-3.4.0/mimetypes/application/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/application/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/application/Makefile.in 2005-03-04 20:41:59.083745812 +0100
+@@ -850,7 +865,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/application/Makefile.in kdelibs-3.4.0/mimetypes/application/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/application/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/application/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25104,13 +26654,23 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/audio/Makefile.in kdelibs-3.4.0/mimetypes/audio/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/audio/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/audio/Makefile.in 2005-03-04 20:41:59.276712866 +0100
+@@ -769,7 +772,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/audio/Makefile.in kdelibs-3.4.0/mimetypes/audio/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/audio/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/audio/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25150,13 +26710,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/image/Makefile.in kdelibs-3.4.0/mimetypes/image/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/image/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/image/Makefile.in 2005-03-04 20:41:59.370696820 +0100
+@@ -707,7 +710,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/image/Makefile.in kdelibs-3.4.0/mimetypes/image/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/image/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/image/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25196,13 +26766,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/inode/Makefile.in kdelibs-3.4.0/mimetypes/inode/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/inode/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/inode/Makefile.in 2005-03-04 20:41:59.421688115 +0100
+@@ -711,7 +714,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/inode/Makefile.in kdelibs-3.4.0/mimetypes/inode/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/inode/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/inode/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25242,13 +26822,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/message/Makefile.in kdelibs-3.4.0/mimetypes/message/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/message/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/message/Makefile.in 2005-03-04 20:41:59.456682140 +0100
+@@ -700,7 +703,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/message/Makefile.in kdelibs-3.4.0/mimetypes/message/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/message/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/message/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25288,13 +26878,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/model/Makefile.in kdelibs-3.4.0/mimetypes/model/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/model/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/model/Makefile.in 2005-03-04 20:41:59.611655681 +0100
+@@ -698,7 +701,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/model/Makefile.in kdelibs-3.4.0/mimetypes/model/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/model/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/model/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25334,13 +26934,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/multipart/Makefile.in kdelibs-3.4.0/mimetypes/multipart/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/multipart/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/multipart/Makefile.in 2005-03-04 20:41:59.776627516 +0100
+@@ -698,7 +701,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/multipart/Makefile.in kdelibs-3.4.0/mimetypes/multipart/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/multipart/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/multipart/Makefile.in 2005-03-18 16:05:30.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25380,13 +26990,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/text/Makefile.in kdelibs-3.4.0/mimetypes/text/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/text/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/text/Makefile.in 2005-03-04 20:41:59.936600203 +0100
+@@ -698,7 +701,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/text/Makefile.in kdelibs-3.4.0/mimetypes/text/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/text/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/text/Makefile.in 2005-03-18 16:05:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25435,13 +27055,23 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/uri/Makefile.in kdelibs-3.4.0/mimetypes/uri/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/uri/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/uri/Makefile.in 2005-03-04 20:42:00.075576476 +0100
+@@ -712,7 +715,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/uri/Makefile.in kdelibs-3.4.0/mimetypes/uri/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/uri/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/uri/Makefile.in 2005-03-18 16:05:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25481,13 +27111,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/mimetypes/video/Makefile.in kdelibs-3.4.0/mimetypes/video/Makefile.in
---- kdelibs-3.4.0.orig/mimetypes/video/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/mimetypes/video/Makefile.in 2005-03-04 20:42:00.327533459 +0100
+@@ -698,7 +701,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/mimetypes/video/Makefile.in kdelibs-3.4.0/mimetypes/video/Makefile.in
+--- kdelibs-3.4.0.orig/mimetypes/video/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/mimetypes/video/Makefile.in 2005-03-18 16:05:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25527,13 +27167,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/pics/Makefile.in kdelibs-3.4.0/pics/Makefile.in
---- kdelibs-3.4.0.orig/pics/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/pics/Makefile.in 2005-03-04 20:42:00.354528850 +0100
+@@ -702,7 +705,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/pics/Makefile.in kdelibs-3.4.0/pics/Makefile.in
+--- kdelibs-3.4.0.orig/pics/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/pics/Makefile.in 2005-03-18 16:05:31.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25653,13 +27303,14 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/pics/crystalsvg/Makefile.in kdelibs-3.4.0/pics/crystalsvg/Makefile.in
---- kdelibs-3.4.0.orig/pics/crystalsvg/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/pics/crystalsvg/Makefile.in 2005-03-04 20:42:01.247376413 +0100
+diff -Nrua kdelibs-3.4.0.orig/pics/crystalsvg/Makefile.in kdelibs-3.4.0/pics/crystalsvg/Makefile.in
+--- kdelibs-3.4.0.orig/pics/crystalsvg/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/pics/crystalsvg/Makefile.in 2005-03-18 16:05:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32944,13 +34595,23 @@
#>+ 15
force-reedit:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in
---- kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in 2005-03-04 20:42:01.315364805 +0100
+@@ -4536,7 +4551,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in
+--- kdelibs-3.4.0.orig/pics/crystalsvg/kde/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/pics/crystalsvg/kde/Makefile.in 2005-03-18 16:05:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32999,13 +34660,23 @@
#>+ 2
docs-am:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/pics/emoticons/Makefile.in kdelibs-3.4.0/pics/emoticons/Makefile.in
---- kdelibs-3.4.0.orig/pics/emoticons/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/pics/emoticons/Makefile.in 2005-03-04 20:42:01.474337664 +0100
+@@ -685,7 +688,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/pics/emoticons/Makefile.in kdelibs-3.4.0/pics/emoticons/Makefile.in
+--- kdelibs-3.4.0.orig/pics/emoticons/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/pics/emoticons/Makefile.in 2005-03-18 16:05:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33045,13 +34716,23 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -x debian -Nru kdelibs-3.4.0.orig/pics/hicolor/Makefile.in kdelibs-3.4.0/pics/hicolor/Makefile.in
---- kdelibs-3.4.0.orig/pics/hicolor/Makefile.in 2005-03-04 14:23:38.000000000 +0100
-+++ kdelibs-3.4.0/pics/hicolor/Makefile.in 2005-03-04 20:42:01.625311888 +0100
+@@ -696,7 +699,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \
+diff -Nrua kdelibs-3.4.0.orig/pics/hicolor/Makefile.in kdelibs-3.4.0/pics/hicolor/Makefile.in
+--- kdelibs-3.4.0.orig/pics/hicolor/Makefile.in 2005-03-04 08:23:38.000000000 -0500
++++ kdelibs-3.4.0/pics/hicolor/Makefile.in 2005-03-18 16:05:32.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
++# KDE tags expanded automatically by am_edit - $Revision: 1.412.6.2 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33141,3 +34822,12 @@
#>+ 15
force-reedit:
+@@ -727,7 +730,7 @@
+ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+ echo "$$i"; \
+- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ rm -f $$i.bchecktest.cc; exit 1; \
+ fi ; \
+ echo "" >> $$i.bchecktest.cc.class; \