[Pkg-kde-commits] rev 1368 - in
branches/kde-3.4.0/packages/arts/debian: . patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Tue Jul 26 19:59:06 UTC 2005
Author: chrsmrtn-guest
Date: 2005-07-26 19:59:05 +0000 (Tue, 26 Jul 2005)
New Revision: 1368
Modified:
branches/kde-3.4.0/packages/arts/debian/changelog
branches/kde-3.4.0/packages/arts/debian/patches/98_buildprep.diff
Log:
First part of the arts gcc transition. Changelog and new buildprep.
Modified: branches/kde-3.4.0/packages/arts/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/changelog 2005-07-26 19:48:18 UTC (rev 1367)
+++ branches/kde-3.4.0/packages/arts/debian/changelog 2005-07-26 19:59:05 UTC (rev 1368)
@@ -1,7 +1,11 @@
-arts (1.4.1-1+SVN) UNRELEASED; urgency=low
+arts (1.4.2-1) UNRELEASED; urgency=low
+ * New upstream release.
+
+++ Changes by Christopher Martin:
+ * libarts1 becomes libarts1c2, for the ABI-breaking gcc 4.0 transition.
+
* Bump build-depends on libmad-dev, to ensure that we build against a version
that sets shlibs. Once this package is uploaded to unstable, this will be
sufficient to ensure that all of KDE depends on a fixed libmad0, as arts
Modified: branches/kde-3.4.0/packages/arts/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/arts/debian/patches/98_buildprep.diff 2005-07-26 19:48:18 UTC (rev 1367)
+++ branches/kde-3.4.0/packages/arts/debian/patches/98_buildprep.diff 2005-07-26 19:59:05 UTC (rev 1368)
@@ -1,7 +1,7 @@
-diff -rua arts-1.4.1.orig/acinclude.m4 arts-1.4.1/acinclude.m4
---- arts-1.4.1.orig/acinclude.m4 2005-05-23 17:35:54.000000000 +0200
-+++ arts-1.4.1/acinclude.m4 2005-05-24 15:10:31.613741838 +0200
-@@ -1690,15 +1690,6 @@
+diff -Nru arts-1.4.2.orig/acinclude.m4 arts-1.4.2/acinclude.m4
+--- arts-1.4.2.orig/acinclude.m4 2005-07-20 19:48:22.000000000 +0000
++++ arts-1.4.2/acinclude.m4 2005-07-26 18:26:38.715703168 +0000
+@@ -1688,15 +1688,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -17,7 +17,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2139,9 +2130,6 @@
+@@ -2138,9 +2129,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27,7 +27,80 @@
AC_TRY_COMPILE([
$2
],
-@@ -5770,6 +5758,7 @@
+@@ -3288,39 +3276,39 @@
+
+ if test "x$GXX" = "xyes"; then
+ kde_have_gcc_visibility=no
+- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
+- [
+- kde_have_gcc_visibility=yes
+- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+- [
+- AC_LANG_SAVE
+- AC_LANG_CPLUSPLUS
+-
+- safe_CXXFLAGS=$CXXFLAGS
+- CXXFLAGS="$CXXFLAGS $all_includes"
+-
+- AC_TRY_COMPILE(
+- [
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+- ], [/* elvis is alive */],
+- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+-
+- CXXFLAGS=$safe_CXXFLAGS
+- AC_LANG_RESTORE
+- ]
+- )
+-
+- if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- 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])
+- fi
+- ])
++dnl KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
++dnl [
++dnl kde_have_gcc_visibility=yes
++dnl AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
++dnl [
++dnl AC_LANG_SAVE
++dnl AC_LANG_CPLUSPLUS
++dnl
++dnl safe_CXXFLAGS=$CXXFLAGS
++dnl CXXFLAGS="$CXXFLAGS $all_includes"
++dnl
++dnl AC_TRY_COMPILE(
++dnl [
++dnl #include <qglobal.h>
++dnl #if Q_EXPORT - 0 != 0
++dnl /* if this compiles, then Q_EXPORT is undefined */
++dnl /* if Q_EXPORT is nonempty, this will break compilation */
++dnl #endif
++dnl ], [/* elvis is alive */],
++dnl kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
++dnl
++dnl CXXFLAGS=$safe_CXXFLAGS
++dnl AC_LANG_RESTORE
++dnl ]
++dnl )
++dnl
++dnl if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
++dnl CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++dnl KDE_CHECK_VISIBILITY_GCC_BUG
++dnl HAVE_GCC_VISIBILITY=1
++dnl AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
++dnl fi
++dnl ])
+ fi
+ ])
+
+@@ -5799,6 +5787,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -35,7 +108,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5829,7 +5818,7 @@
+@@ -5858,7 +5847,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -44,7 +117,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6243,12 +6232,11 @@
+@@ -6272,12 +6261,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -58,7 +131,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6260,7 +6248,6 @@
+@@ -6289,7 +6277,6 @@
esac
;;
*64-bit*)
@@ -66,7 +139,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6390,7 +6377,7 @@
+@@ -6419,7 +6406,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -75,7 +148,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6419,20 +6406,26 @@
+@@ -6448,20 +6435,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -107,7 +180,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.
-@@ -6582,7 +6575,7 @@
+@@ -6611,7 +6604,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -116,7 +189,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6671,13 +6664,6 @@
+@@ -6700,13 +6693,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -130,7 +203,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.
-@@ -6701,8 +6687,11 @@
+@@ -6730,8 +6716,11 @@
fi
fi
chmod u+w .
@@ -144,7 +217,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6819,7 +6808,7 @@
+@@ -6848,7 +6837,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -153,7 +226,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6832,7 +6821,7 @@
+@@ -6861,7 +6850,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -162,7 +235,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6842,7 +6831,20 @@
+@@ -6871,7 +6860,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -184,7 +257,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6907,7 +6909,7 @@
+@@ -6936,7 +6938,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -193,7 +266,7 @@
;;
beos*)
-@@ -6932,7 +6934,7 @@
+@@ -6961,7 +6963,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -202,7 +275,7 @@
need_version=no
need_lib_prefix=no
-@@ -6997,7 +6999,7 @@
+@@ -7026,7 +7028,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -211,7 +284,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"`
-@@ -7020,7 +7022,7 @@
+@@ -7049,7 +7051,7 @@
dynamic_linker=no
;;
@@ -220,7 +293,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7080,7 +7082,7 @@
+@@ -7109,7 +7111,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -229,7 +302,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7095,7 +7097,7 @@
+@@ -7124,7 +7126,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -238,7 +311,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7106,7 +7108,7 @@
+@@ -7135,7 +7137,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -247,7 +320,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7168,22 +7170,19 @@
+@@ -7197,22 +7199,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'
@@ -276,7 +349,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,
-@@ -7193,6 +7192,30 @@
+@@ -7222,6 +7221,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -307,7 +380,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7202,7 +7225,7 @@
+@@ -7231,7 +7254,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -316,7 +389,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7231,7 +7254,7 @@
+@@ -7260,7 +7283,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -325,7 +398,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
-@@ -7251,7 +7274,7 @@
+@@ -7280,7 +7303,7 @@
os2*)
libname_spec='$name'
@@ -334,7 +407,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7842,31 +7865,23 @@
+@@ -7871,31 +7894,23 @@
;;
cygwin*)
@@ -375,7 +448,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7905,42 +7920,21 @@
+@@ -7934,42 +7949,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -425,7 +498,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
-@@ -7969,9 +7963,6 @@
+@@ -7998,9 +7992,6 @@
;;
osf3* | osf4* | osf5*)
@@ -435,7 +508,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7981,7 +7972,6 @@
+@@ -8010,7 +8001,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -443,7 +516,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8247,7 +8237,7 @@
+@@ -8276,7 +8266,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])
@@ -452,7 +525,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
-@@ -8297,7 +8287,7 @@
+@@ -8326,7 +8316,7 @@
fi
;;
@@ -461,7 +534,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8307,29 +8297,29 @@
+@@ -8336,29 +8326,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -505,7 +578,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8337,8 +8327,8 @@
+@@ -8366,8 +8356,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -516,7 +589,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8446,8 +8436,8 @@
+@@ -8475,8 +8465,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
@@ -527,7 +600,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8473,7 +8463,7 @@
+@@ -8502,7 +8492,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.
@@ -536,7 +609,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8503,8 +8493,22 @@
+@@ -8532,8 +8522,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -561,7 +634,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8550,15 +8554,16 @@
+@@ -8579,15 +8583,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -582,7 +655,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.
-@@ -8567,13 +8572,12 @@
+@@ -8596,13 +8601,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -598,7 +671,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8588,7 +8592,7 @@
+@@ -8617,7 +8621,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.
@@ -607,7 +680,7 @@
fi
fi
;;
-@@ -8605,12 +8609,12 @@
+@@ -8634,12 +8638,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'
@@ -622,7 +695,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
-@@ -8619,7 +8623,7 @@
+@@ -8648,7 +8652,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -631,7 +704,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8630,20 +8634,20 @@
+@@ -8659,20 +8663,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -662,7 +735,7 @@
fi
;;
esac
-@@ -8653,19 +8657,19 @@
+@@ -8682,19 +8686,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -688,7 +761,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8700,7 +8704,7 @@
+@@ -8729,7 +8733,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -697,7 +770,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8722,7 +8726,7 @@
+@@ -8751,7 +8755,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -706,7 +779,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8731,11 +8735,11 @@
+@@ -8760,11 +8764,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.
@@ -720,7 +793,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8792,7 +8796,7 @@
+@@ -8821,7 +8825,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -729,7 +802,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8813,7 +8817,7 @@
+@@ -8842,7 +8846,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -738,7 +811,7 @@
;;
esac
fi
-@@ -8828,7 +8832,7 @@
+@@ -8857,7 +8861,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -747,7 +820,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8839,9 +8843,9 @@
+@@ -8868,9 +8872,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -759,7 +832,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8858,8 +8862,8 @@
+@@ -8887,8 +8891,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.
@@ -770,7 +843,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8881,16 +8885,16 @@
+@@ -8910,16 +8914,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -791,7 +864,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8928,7 +8932,7 @@
+@@ -8957,7 +8961,7 @@
;;
esac
;;
@@ -800,7 +873,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=
-@@ -8947,7 +8951,7 @@
+@@ -8976,7 +8980,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.
@@ -809,7 +882,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8964,7 +8968,7 @@
+@@ -8993,7 +8997,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -818,7 +891,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8982,7 +8986,7 @@
+@@ -9011,7 +9015,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -827,7 +900,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9007,7 +9011,7 @@
+@@ -9036,7 +9040,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.
@@ -836,7 +909,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9023,10 +9027,10 @@
+@@ -9052,10 +9056,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -849,7 +922,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9045,7 +9049,7 @@
+@@ -9074,7 +9078,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -858,7 +931,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9102,9 +9106,9 @@
+@@ -9131,9 +9135,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -870,7 +943,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9138,7 +9142,7 @@
+@@ -9167,7 +9171,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -879,7 +952,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9148,9 +9152,9 @@
+@@ -9177,9 +9181,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
@@ -891,7 +964,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9159,9 +9163,9 @@
+@@ -9188,9 +9192,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -903,7 +976,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9329,7 +9333,7 @@
+@@ -9358,7 +9362,7 @@
fi
;;
@@ -912,7 +985,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9438,7 +9442,7 @@
+@@ -9467,7 +9471,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -921,7 +994,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9580,11 +9584,12 @@
+@@ -9609,11 +9613,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -936,7 +1009,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 \
-@@ -9634,7 +9639,7 @@
+@@ -9663,7 +9668,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -945,7 +1018,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9765,7 +9770,7 @@
+@@ -9794,7 +9799,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -954,7 +1027,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9796,7 +9801,7 @@
+@@ -9825,7 +9830,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -963,7 +1036,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10040,7 +10045,10 @@
+@@ -10069,7 +10074,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.
@@ -975,7 +1048,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10113,7 +10121,7 @@
+@@ -10142,7 +10150,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -984,7 +1057,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10131,7 +10139,7 @@
+@@ -10160,7 +10168,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -993,7 +1066,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10346,7 +10354,7 @@
+@@ -10375,7 +10383,7 @@
;;
esac
;;
@@ -1002,7 +1075,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10397,7 +10405,7 @@
+@@ -10426,7 +10434,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'
@@ -1011,7 +1084,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10422,7 +10430,7 @@
+@@ -10451,7 +10459,7 @@
;;
esac
;;
@@ -1020,7 +1093,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10733,6 +10741,9 @@
+@@ -10762,6 +10770,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'
;;
@@ -1030,7 +1103,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10757,7 +10768,7 @@
+@@ -10786,7 +10797,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1039,7 +1112,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*
-@@ -10831,7 +10842,7 @@
+@@ -10860,7 +10871,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1048,7 +1121,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10841,13 +10852,13 @@
+@@ -10870,13 +10881,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'
@@ -1064,7 +1137,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
-@@ -10856,19 +10867,19 @@
+@@ -10885,19 +10896,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1088,7 +1161,7 @@
fi
;;
-@@ -10886,8 +10897,8 @@
+@@ -10915,8 +10926,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1099,7 +1172,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10900,10 +10911,36 @@
+@@ -10929,10 +10940,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1138,7 +1211,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10953,9 +10990,20 @@
+@@ -10982,9 +11019,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
@@ -1161,7 +1234,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11001,29 +11049,29 @@
+@@ -11030,29 +11078,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1200,7 +1273,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11038,7 +11086,7 @@
+@@ -11067,7 +11115,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.
@@ -1209,7 +1282,7 @@
fi
fi
;;
-@@ -11061,13 +11109,13 @@
+@@ -11090,13 +11138,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1226,7 +1299,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.
-@@ -11081,21 +11129,21 @@
+@@ -11110,21 +11158,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1261,7 +1334,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11104,26 +11152,26 @@
+@@ -11133,26 +11181,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1296,7 +1369,7 @@
;;
dgux*)
-@@ -11156,8 +11204,8 @@
+@@ -11185,8 +11233,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1307,7 +1380,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
-@@ -11165,7 +11213,7 @@
+@@ -11194,7 +11242,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1316,7 +1389,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
-@@ -11183,10 +11231,10 @@
+@@ -11212,10 +11260,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1329,7 +1402,7 @@
;;
esac
else
-@@ -11233,7 +11281,7 @@
+@@ -11262,7 +11310,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1338,7 +1411,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'
-@@ -11243,7 +11291,7 @@
+@@ -11272,7 +11320,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1347,7 +1420,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
-@@ -11266,7 +11314,7 @@
+@@ -11295,7 +11343,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
@@ -1356,7 +1429,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11276,7 +11324,7 @@
+@@ -11305,7 +11353,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1365,7 +1438,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11287,14 +11335,14 @@
+@@ -11316,14 +11364,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
@@ -1382,7 +1455,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'
-@@ -11306,7 +11354,7 @@
+@@ -11335,7 +11383,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}\*'
@@ -1391,7 +1464,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11331,9 +11379,9 @@
+@@ -11360,9 +11408,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1403,7 +1476,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~
-@@ -11353,7 +11401,7 @@
+@@ -11382,7 +11430,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.
@@ -1412,7 +1485,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11413,9 +11461,9 @@
+@@ -11442,9 +11490,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1424,7 +1497,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11473,7 +11521,7 @@
+@@ -11502,7 +11550,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1433,7 +1506,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11632,8 +11680,8 @@
+@@ -11661,8 +11709,8 @@
fi
done
done
@@ -1443,9 +1516,9 @@
AC_MSG_RESULT([$SED])
])
-diff -rua arts-1.4.1.orig/aclocal.m4 arts-1.4.1/aclocal.m4
---- arts-1.4.1.orig/aclocal.m4 2005-05-23 17:36:18.000000000 +0200
-+++ arts-1.4.1/aclocal.m4 2005-05-24 15:10:40.696923582 +0200
+diff -Nru arts-1.4.2.orig/aclocal.m4 arts-1.4.2/aclocal.m4
+--- arts-1.4.2.orig/aclocal.m4 2005-07-20 19:48:36.000000000 +0000
++++ arts-1.4.2/aclocal.m4 2005-07-26 18:27:00.904329984 +0000
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1482,9 +1555,9 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-diff -rua arts-1.4.1.orig/artsc/Makefile.in arts-1.4.1/artsc/Makefile.in
---- arts-1.4.1.orig/artsc/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/artsc/Makefile.in 2005-05-24 15:10:58.207346154 +0200
+diff -Nru arts-1.4.2.orig/artsc/Makefile.in arts-1.4.2/artsc/Makefile.in
+--- arts-1.4.2.orig/artsc/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/artsc/Makefile.in 2005-07-26 18:27:37.508765264 +0000
@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -1525,9 +1598,22 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h3
touch $@
-diff -rua arts-1.4.1.orig/configure arts-1.4.1/configure
---- arts-1.4.1.orig/configure 2005-05-23 17:36:53.000000000 +0200
-+++ arts-1.4.1/configure 2005-05-24 15:11:00.385149965 +0200
+diff -Nru arts-1.4.2.orig/config.h.in arts-1.4.2/config.h.in
+--- arts-1.4.2.orig/config.h.in 2005-07-20 19:48:43.000000000 +0000
++++ arts-1.4.2/config.h.in 2005-07-26 18:27:10.597856344 +0000
+@@ -651,9 +651,6 @@
+ #endif
+
+
+-/* define to 1 if -fvisibility is supported */
+-#undef __KDE_HAVE_GCC_VISIBILITY
+-
+
+ #if defined(__SVR4) && !defined(__svr4__)
+ #define __svr4__ 1
+diff -Nru arts-1.4.2.orig/configure arts-1.4.2/configure
+--- arts-1.4.2.orig/configure 2005-07-20 19:49:02.000000000 +0000
++++ arts-1.4.2/configure 2005-07-26 18:27:43.703823472 +0000
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -6491,37 +6577,298 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29761,8 +29675,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+@@ -29722,290 +29636,6 @@
+
+ if test "x$GXX" = "xyes"; then
+ kde_have_gcc_visibility=no
+-
+-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
+-
+-
+-
+- 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'
+-
+-
+- save_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+- return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (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'
-+ { 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=$?
-@@ -29849,8 +29762,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- { (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_have_gcc_visibility=yes
+- echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
+-if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-
+-
+- ac_ext=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'
+-
+-
+-
+- safe_CXXFLAGS=$CXXFLAGS
+- CXXFLAGS="$CXXFLAGS $all_includes"
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+-
+-int
+-main ()
+-{
+-/* elvis is alive */
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-+ { 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=$?
-@@ -29937,8 +29849,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- kde_cv_val_qt_gcc_visibility_patched=no
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-kde_cv_val_qt_gcc_visibility_patched=yes
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+- CXXFLAGS=$safe_CXXFLAGS
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-
+-fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
+-
+- if test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+-
+- echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
+-if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-
+-
+- ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+-
+- safe_CXXFLAGS=$CXXFLAGS
+- safe_LDFLAGS=$LDFLAGS
+- CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
+- LDFLAGS="$LDFLAGS -shared -fPIC"
+-
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+- /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
+- #include <string>
+- int some_function( void ) __attribute__ ((visibility("default")));
+- int some_function( void )
+- {
+- std::string s("blafasel");
+- return 0;
+- }
+-
+-int
+-main ()
+-{
+-/* elvis is alive */
+- ;
+- 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'
-+ { 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=$?
-@@ -30025,8 +29936,7 @@
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- kde_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=$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
+-
+-
+- HAVE_GCC_VISIBILITY=1
+-
+-cat >>confdefs.h <<_ACEOF
+-#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
+-_ACEOF
+-
+- fi
+-
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- :
+-
+-fi
+-
+ fi
+
+
+@@ -30062,8 +29692,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6531,37 +6878,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30119,8 +30029,7 @@
+@@ -30155,8 +29784,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=$?
-@@ -30235,8 +30144,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=$?
-@@ -30328,8 +30236,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30401,8 +30308,7 @@
+@@ -30228,8 +29856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6571,7 +6898,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30456,8 +30362,7 @@
+@@ -30283,8 +29910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6581,7 +6908,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30528,8 +30433,7 @@
+@@ -30355,8 +29981,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6591,7 +6918,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30583,8 +30487,7 @@
+@@ -30410,8 +30035,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6601,7 +6928,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30651,8 +30554,7 @@
+@@ -30478,8 +30102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6611,7 +6938,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30838,8 +30740,7 @@
+@@ -30665,8 +30288,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6621,7 +6948,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31006,8 +30907,7 @@
+@@ -30833,8 +30455,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6631,7 +6958,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31318,8 +31218,7 @@
+@@ -31145,8 +30766,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6641,7 +6968,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31542,8 +31441,7 @@
+@@ -31369,8 +30989,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6651,7 +6978,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31619,8 +31517,7 @@
+@@ -31446,8 +31065,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6661,7 +6988,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31762,8 +31659,7 @@
+@@ -31589,8 +31207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6671,7 +6998,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31838,8 +31734,7 @@
+@@ -31665,8 +31282,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6681,7 +7008,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31899,8 +31794,7 @@
+@@ -31726,8 +31342,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6691,7 +7018,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31983,8 +31877,7 @@
+@@ -31810,8 +31425,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6701,7 +7028,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32077,8 +31970,7 @@
+@@ -31904,8 +31518,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6711,7 +7038,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32186,8 +32078,7 @@
+@@ -32013,8 +31626,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6721,7 +7048,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32285,8 +32176,7 @@
+@@ -32112,8 +31724,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6731,7 +7058,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32379,8 +32269,7 @@
+@@ -32206,8 +31817,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6741,7 +7068,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32463,8 +32352,7 @@
+@@ -32290,8 +31900,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6751,25 +7078,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32517,7 +32405,7 @@
+@@ -32344,7 +31953,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 32520: $i/$j" >&5
-+ echo "configure: 32408: $i/$j" >&5
+- echo "configure: 32347: $i/$j" >&5
++ echo "configure: 31956: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -32825,7 +32713,7 @@
+@@ -32647,7 +32256,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 32828: $i/$j" >&5
-+ echo "configure: 32716: $i/$j" >&5
+- echo "configure: 32650: $i/$j" >&5
++ echo "configure: 32259: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -33502,8 +33390,7 @@
+@@ -33324,8 +32933,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6779,34 +7106,34 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33661,7 +33548,7 @@
+@@ -33483,7 +33091,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 33664: $i/$j" >&5
-+ echo "configure: 33551: $i/$j" >&5
+- echo "configure: 33486: $i/$j" >&5
++ echo "configure: 33094: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -33691,7 +33578,7 @@
+@@ -33513,7 +33121,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 33694: $i/$j" >&5
-+ echo "configure: 33581: $i/$j" >&5
+- echo "configure: 33516: $i/$j" >&5
++ echo "configure: 33124: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -33709,7 +33596,7 @@
+@@ -33531,7 +33139,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 33712: $i/$j" >&5
-+ echo "configure: 33599: $i/$j" >&5
+- echo "configure: 33534: $i/$j" >&5
++ echo "configure: 33142: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -33929,8 +33816,7 @@
+@@ -33751,8 +33359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6816,7 +7143,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33990,8 +33876,7 @@
+@@ -33812,8 +33419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6826,7 +7153,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34084,8 +33969,7 @@
+@@ -33906,8 +33512,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6836,7 +7163,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34150,8 +34034,7 @@
+@@ -33972,8 +33577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6846,7 +7173,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34275,8 +34158,7 @@
+@@ -34097,8 +33701,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6856,7 +7183,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34434,8 +34316,7 @@
+@@ -34256,8 +33859,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6866,7 +7193,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34501,8 +34382,7 @@
+@@ -34323,8 +33925,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6876,7 +7203,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34544,8 +34424,7 @@
+@@ -34366,8 +33967,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6886,7 +7213,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34602,8 +34481,7 @@
+@@ -34424,8 +34024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6896,7 +7223,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34785,8 +34663,7 @@
+@@ -34607,8 +34206,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6906,7 +7233,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34850,8 +34727,7 @@
+@@ -34672,8 +34270,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6916,7 +7243,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34919,8 +34795,7 @@
+@@ -34741,8 +34338,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6926,7 +7253,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35105,8 +34980,7 @@
+@@ -34927,8 +34523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6936,7 +7263,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35391,9 +35265,6 @@
+@@ -35213,9 +34808,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6946,7 +7273,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35426,8 +35297,7 @@
+@@ -35248,8 +34840,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6956,7 +7283,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35530,8 +35400,7 @@
+@@ -35352,8 +34943,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6966,7 +7293,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35610,9 +35479,6 @@
+@@ -35432,9 +35022,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6976,7 +7303,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35643,8 +35509,7 @@
+@@ -35465,8 +35052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6986,7 +7313,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35745,8 +35610,7 @@
+@@ -35567,8 +35153,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6996,7 +7323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35825,9 +35689,6 @@
+@@ -35647,9 +35232,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7006,7 +7333,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35862,8 +35723,7 @@
+@@ -35684,8 +35266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7016,7 +7343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35968,8 +35828,7 @@
+@@ -35790,8 +35371,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7026,7 +7353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36048,9 +35907,6 @@
+@@ -35870,9 +35450,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7036,7 +7363,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36083,8 +35939,7 @@
+@@ -35905,8 +35482,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7046,7 +7373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36187,8 +36042,7 @@
+@@ -36009,8 +35585,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7056,7 +7383,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36266,9 +36120,6 @@
+@@ -36088,9 +35663,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7066,7 +7393,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -36301,8 +36152,7 @@
+@@ -36123,8 +35695,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7076,7 +7403,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36405,8 +36255,7 @@
+@@ -36227,8 +35798,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7086,7 +7413,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36500,8 +36349,7 @@
+@@ -36322,8 +35892,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7096,7 +7423,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36583,8 +36431,7 @@
+@@ -36405,8 +35974,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7106,7 +7433,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36662,8 +36509,7 @@
+@@ -36484,8 +36052,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7116,7 +7443,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36802,8 +36648,7 @@
+@@ -36624,8 +36191,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7126,7 +7453,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36955,8 +36800,7 @@
+@@ -36777,8 +36343,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7136,7 +7463,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37049,8 +36893,7 @@
+@@ -36871,8 +36436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7146,7 +7473,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37202,8 +37045,7 @@
+@@ -37024,8 +36588,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7156,7 +7483,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37297,8 +37139,7 @@
+@@ -37119,8 +36682,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7166,7 +7493,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37450,8 +37291,7 @@
+@@ -37272,8 +36834,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7176,7 +7503,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37545,8 +37385,7 @@
+@@ -37367,8 +36928,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7186,7 +7513,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37707,8 +37546,7 @@
+@@ -37529,8 +37089,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7196,7 +7523,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37815,8 +37653,7 @@
+@@ -37637,8 +37196,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7206,7 +7533,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37977,8 +37814,7 @@
+@@ -37799,8 +37357,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7216,7 +7543,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38121,8 +37957,7 @@
+@@ -37943,8 +37500,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7226,7 +7553,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38175,8 +38010,7 @@
+@@ -37997,8 +37553,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7236,7 +7563,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38237,9 +38071,6 @@
+@@ -38059,9 +37614,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7246,7 +7573,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38275,8 +38106,7 @@
+@@ -38097,8 +37649,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7256,7 +7583,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38383,8 +38213,7 @@
+@@ -38205,8 +37756,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7266,7 +7593,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38486,8 +38315,7 @@
+@@ -38308,8 +37858,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7276,7 +7603,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38535,8 +38363,7 @@
+@@ -38357,8 +37906,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7286,7 +7613,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38584,8 +38411,7 @@
+@@ -38406,8 +37954,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7296,7 +7623,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38694,8 +38520,7 @@
+@@ -38516,8 +38063,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7306,7 +7633,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38773,8 +38598,7 @@
+@@ -38595,8 +38141,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7316,7 +7643,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38854,8 +38678,7 @@
+@@ -38676,8 +38221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7326,7 +7653,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38969,8 +38792,7 @@
+@@ -38791,8 +38335,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7336,7 +7663,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39066,8 +38888,7 @@
+@@ -38888,8 +38431,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7346,7 +7673,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39232,8 +39053,7 @@
+@@ -39054,8 +38596,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7356,7 +7683,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39294,8 +39114,7 @@
+@@ -39116,8 +38657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7366,7 +7693,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39356,8 +39175,7 @@
+@@ -39178,8 +38718,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7376,7 +7703,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39424,8 +39242,7 @@
+@@ -39246,8 +38785,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7386,7 +7713,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39505,8 +39322,7 @@
+@@ -39327,8 +38865,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7396,7 +7723,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39596,8 +39412,7 @@
+@@ -39418,8 +38955,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7406,7 +7733,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39833,8 +39648,7 @@
+@@ -39655,8 +39191,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7416,7 +7743,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39987,8 +39801,7 @@
+@@ -39809,8 +39344,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7426,7 +7753,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40097,8 +39910,7 @@
+@@ -39919,8 +39453,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7436,7 +7763,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40168,8 +39980,7 @@
+@@ -39990,8 +39523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7446,7 +7773,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40332,8 +40143,7 @@
+@@ -40154,8 +39686,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7456,7 +7783,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40496,8 +40306,7 @@
+@@ -40318,8 +39849,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7466,7 +7793,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40663,8 +40472,7 @@
+@@ -40485,8 +40015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7476,7 +7803,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40743,8 +40551,7 @@
+@@ -40565,8 +40094,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7486,7 +7813,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40800,8 +40607,7 @@
+@@ -40622,8 +40150,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7496,7 +7823,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41170,8 +40976,7 @@
+@@ -40992,8 +40519,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7506,7 +7833,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41269,8 +41074,7 @@
+@@ -41091,8 +40617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7516,7 +7843,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41333,8 +41137,7 @@
+@@ -41155,8 +40680,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7526,7 +7853,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41415,8 +41218,7 @@
+@@ -41237,8 +40761,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7536,7 +7863,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41557,8 +41359,7 @@
+@@ -41379,8 +40902,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7546,7 +7873,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42126,6 +41927,13 @@
+@@ -41948,6 +41470,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -7560,7 +7887,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
-@@ -42885,6 +42693,9 @@
+@@ -42707,6 +42236,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -7570,7 +7897,7 @@
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
-@@ -43242,11 +43053,6 @@
+@@ -43064,11 +42596,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -7582,7 +7909,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. */
-@@ -43285,6 +43091,12 @@
+@@ -43107,6 +42634,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -7595,9 +7922,9 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -rua arts-1.4.1.orig/configure.in arts-1.4.1/configure.in
---- arts-1.4.1.orig/configure.in 2005-05-23 17:35:56.000000000 +0200
-+++ arts-1.4.1/configure.in 2005-05-24 15:10:31.982708599 +0200
+diff -Nru arts-1.4.2.orig/configure.in arts-1.4.2/configure.in
+--- arts-1.4.2.orig/configure.in 2005-07-20 19:48:23.000000000 +0000
++++ arts-1.4.2/configure.in 2005-07-26 18:26:39.424595400 +0000
@@ -27,6 +27,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(arts, $ARTS_VERSION) dnl searches for some needed programs
@@ -7607,10 +7934,9 @@
AC_PROG_INSTALL
dnl generate the config header
-Seulement dans arts-1.4.1: debian
-diff -rua arts-1.4.1.orig/doc/Makefile.in arts-1.4.1/doc/Makefile.in
---- arts-1.4.1.orig/doc/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/doc/Makefile.in 2005-05-24 15:10:58.213345613 +0200
+diff -Nru arts-1.4.2.orig/doc/Makefile.in arts-1.4.2/doc/Makefile.in
+--- arts-1.4.2.orig/doc/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/doc/Makefile.in 2005-07-26 18:27:37.519763592 +0000
@@ -183,6 +183,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7642,9 +7968,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua arts-1.4.1.orig/examples/Makefile.in arts-1.4.1/examples/Makefile.in
---- arts-1.4.1.orig/examples/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/examples/Makefile.in 2005-05-24 15:10:58.245342731 +0200
+diff -Nru arts-1.4.2.orig/examples/Makefile.in arts-1.4.2/examples/Makefile.in
+--- arts-1.4.2.orig/examples/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/examples/Makefile.in 2005-07-26 18:27:37.593752344 +0000
@@ -401,6 +401,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7676,9 +8002,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -rua arts-1.4.1.orig/flow/gsl/Makefile.in arts-1.4.1/flow/gsl/Makefile.in
---- arts-1.4.1.orig/flow/gsl/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/flow/gsl/Makefile.in 2005-05-24 15:10:58.276339939 +0200
+@@ -988,7 +991,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=Makefile.in hello_impl.h aggregation.idl playtofile.idl hello.idl Makefile.am
++KDE_DIST=hello_impl.h Makefile.in aggregation.idl playtofile.idl hello.idl Makefile.am
+
+ #>+ 2
+ docs-am:
+diff -Nru arts-1.4.2.orig/flow/gsl/Makefile.in arts-1.4.2/flow/gsl/Makefile.in
+--- arts-1.4.2.orig/flow/gsl/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/flow/gsl/Makefile.in 2005-07-26 18:27:37.667741096 +0000
@@ -262,6 +262,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7710,9 +8045,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
gslconfig.h: $(top_builddir)/config.status $(srcdir)/gslconfig.h.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -rua arts-1.4.1.orig/flow/gslpp/Makefile.in arts-1.4.1/flow/gslpp/Makefile.in
---- arts-1.4.1.orig/flow/gslpp/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/flow/gslpp/Makefile.in 2005-05-24 15:10:58.284339218 +0200
+@@ -839,7 +842,7 @@
+
+
+ #>+ 2
+-KDE_DIST=gsldatahandle-vorbis.h gsldatautils.c gslcommon.c gslmath.c gslcommon.h gslglibhashtest.cc gslsignal.h gsldatautils.h gsl-fftgen.pl gslopmaster.c gslwaveosc-aux.c gslfilehash.h gsloscillator.h gsldatahandle.h gsldatacache.h gslopschedule.c gsl-mplan.txt gslconvert.h gslconvert.c gslmagic.h gslconfig.h.in gslmath.h gsldefs.h gsloputil.h gslarrows gsloscillator-aux.c gsl-fftconf.sh gsldatahandle-mad.c gslfilter.h gslloader-wav.c gslieee754.h gsldatahandle-mad.h gslosctable.h gslloader-oggvorbis.c gslengine.h gsldatahandle.c gslfilter.c gslwaveloader.h gslopschedule.h dummy.cc gslincluder.c gbsearcharray.h gslglib.c gslmakefile.inc gslwaveosc.h gslopnode.h gslmathtest.c gslloader.h gslwavechunk.h gslmagic.c configure.in.in gsldatahandle-vorbis.c arts-patches gslloader-mad.c gslosctable.c gsloscillator.c Makefile.in gslloader.c gslengine.c gsloputil.c gslwaveosc.c gsldatacache.c gslwavechunk.c gslglibhash.cc gsl.gnuplot gslsignal.c gslfft.c gsldatahandle-lbuffer.c gsl.3 gsl-iplan.txt gslglib.h gslwaveloader.c gslopmaster.h gslwave.header gslloader-gslwave.c gslfft.h Makefile.am gslartsthreads.h
++KDE_DIST=gsldatahandle-vorbis.h gsldatautils.c gslcommon.c gslmath.c gslcommon.h gslglibhashtest.cc gslsignal.h gsldatautils.h gsl-fftgen.pl gslopmaster.c gslwaveosc-aux.c gslfilehash.h gsloscillator.h gsldatacache.h gsldatahandle.h gslopschedule.c gsl-mplan.txt gslconvert.h gslconvert.c gslmagic.h gslconfig.h.in gslmath.h gsldefs.h gsloputil.h gslarrows gsloscillator-aux.c gsl-fftconf.sh gsldatahandle-mad.c gslfilter.h gslloader-wav.c gslieee754.h gsldatahandle-mad.h gslloader-oggvorbis.c gslosctable.h gslengine.h gsldatahandle.c gslfilter.c gslwaveloader.h gslopschedule.h dummy.cc gslincluder.c gbsearcharray.h gslglib.c gslmakefile.inc gslwaveosc.h gslopnode.h gslmathtest.c gslloader.h gslwavechunk.h gslmagic.c configure.in.in gsldatahandle-vorbis.c arts-patches gslosctable.c gslloader-mad.c gsloscillator.c Makefile.in gslloader.c gslengine.c gsloputil.c gslwaveosc.c gslwavechunk.c gsldatacache.c gslglibhash.cc gslsignal.c gsl.gnuplot gslfft.c gsldatahandle-lbuffer.c gsl.3 gsl-iplan.txt gslwaveloader.c gslglib.h gslopmaster.h gslloader-gslwave.c gslwave.header gslfft.h Makefile.am gslartsthreads.h
+
+ #>+ 3
+ clean-closures:
+diff -Nru arts-1.4.2.orig/flow/gslpp/Makefile.in arts-1.4.2/flow/gslpp/Makefile.in
+--- arts-1.4.2.orig/flow/gslpp/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/flow/gslpp/Makefile.in 2005-07-26 18:27:37.685738360 +0000
@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7744,9 +8088,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -rua arts-1.4.1.orig/flow/Makefile.in arts-1.4.1/flow/Makefile.in
---- arts-1.4.1.orig/flow/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/flow/Makefile.in 2005-05-24 15:10:58.264341019 +0200
+diff -Nru arts-1.4.2.orig/flow/Makefile.in arts-1.4.2/flow/Makefile.in
+--- arts-1.4.2.orig/flow/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/flow/Makefile.in 2005-07-26 18:27:37.639745352 +0000
@@ -295,6 +295,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7778,9 +8122,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua arts-1.4.1.orig/flow/mcopclass/Makefile.in arts-1.4.1/flow/mcopclass/Makefile.in
---- arts-1.4.1.orig/flow/mcopclass/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/flow/mcopclass/Makefile.in 2005-05-24 15:10:58.290338677 +0200
+diff -Nru arts-1.4.2.orig/flow/mcopclass/Makefile.in arts-1.4.2/flow/mcopclass/Makefile.in
+--- arts-1.4.2.orig/flow/mcopclass/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/flow/mcopclass/Makefile.in 2005-07-26 18:27:37.698736384 +0000
@@ -192,6 +192,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7812,9 +8156,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -rua arts-1.4.1.orig/gmcop/Makefile.in arts-1.4.1/gmcop/Makefile.in
---- arts-1.4.1.orig/gmcop/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/gmcop/Makefile.in 2005-05-24 15:10:58.299337867 +0200
+diff -Nru arts-1.4.2.orig/gmcop/Makefile.in arts-1.4.2/gmcop/Makefile.in
+--- arts-1.4.2.orig/gmcop/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/gmcop/Makefile.in 2005-07-26 18:27:37.717733496 +0000
@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7846,9 +8190,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua arts-1.4.1.orig/libltdl/Makefile.in arts-1.4.1/libltdl/Makefile.in
---- arts-1.4.1.orig/libltdl/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/libltdl/Makefile.in 2005-05-24 15:10:58.306337236 +0200
+diff -Nru arts-1.4.2.orig/libltdl/Makefile.in arts-1.4.2/libltdl/Makefile.in
+--- arts-1.4.2.orig/libltdl/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/libltdl/Makefile.in 2005-07-26 18:27:37.734730912 +0000
@@ -208,6 +208,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7880,9 +8224,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -rua arts-1.4.1.orig/Makefile.in arts-1.4.1/Makefile.in
---- arts-1.4.1.orig/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/Makefile.in 2005-05-24 15:10:58.194347325 +0200
+diff -Nru arts-1.4.2.orig/Makefile.in arts-1.4.2/Makefile.in
+--- arts-1.4.2.orig/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/Makefile.in 2005-07-26 18:27:37.476770128 +0000
@@ -233,6 +233,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7931,13 +8275,13 @@
#>+ 2
-KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am arts.lsm Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am configure arts.lsm Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 arts.lsm Makefile.am.in
#>+ 2
docs-am:
-diff -rua arts-1.4.1.orig/mcop/Makefile.in arts-1.4.1/mcop/Makefile.in
---- arts-1.4.1.orig/mcop/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/mcop/Makefile.in 2005-05-24 15:10:58.320335975 +0200
+diff -Nru arts-1.4.2.orig/mcop/Makefile.in arts-1.4.2/mcop/Makefile.in
+--- arts-1.4.2.orig/mcop/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/mcop/Makefile.in 2005-07-26 18:27:37.765726200 +0000
@@ -256,6 +256,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -7978,9 +8322,9 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h2
touch $@
-diff -rua arts-1.4.1.orig/mcopidl/Makefile.in arts-1.4.1/mcopidl/Makefile.in
---- arts-1.4.1.orig/mcopidl/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/mcopidl/Makefile.in 2005-05-24 15:10:58.336334534 +0200
+diff -Nru arts-1.4.2.orig/mcopidl/Makefile.in arts-1.4.2/mcopidl/Makefile.in
+--- arts-1.4.2.orig/mcopidl/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/mcopidl/Makefile.in 2005-07-26 18:27:37.803720424 +0000
@@ -226,6 +226,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8012,9 +8356,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -rua arts-1.4.1.orig/mcop_mt/Makefile.in arts-1.4.1/mcop_mt/Makefile.in
---- arts-1.4.1.orig/mcop_mt/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/mcop_mt/Makefile.in 2005-05-24 15:10:58.328335255 +0200
+diff -Nru arts-1.4.2.orig/mcop_mt/Makefile.in arts-1.4.2/mcop_mt/Makefile.in
+--- arts-1.4.2.orig/mcop_mt/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/mcop_mt/Makefile.in 2005-07-26 18:27:37.785723160 +0000
@@ -225,6 +225,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8046,9 +8390,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua arts-1.4.1.orig/qtmcop/Makefile.in arts-1.4.1/qtmcop/Makefile.in
---- arts-1.4.1.orig/qtmcop/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/qtmcop/Makefile.in 2005-05-24 15:10:58.347333543 +0200
+diff -Nru arts-1.4.2.orig/qtmcop/Makefile.in arts-1.4.2/qtmcop/Makefile.in
+--- arts-1.4.2.orig/qtmcop/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/qtmcop/Makefile.in 2005-07-26 18:27:37.825717080 +0000
@@ -228,6 +228,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8080,9 +8424,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -rua arts-1.4.1.orig/soundserver/Makefile.in arts-1.4.1/soundserver/Makefile.in
---- arts-1.4.1.orig/soundserver/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/soundserver/Makefile.in 2005-05-24 15:10:58.376330931 +0200
+diff -Nru arts-1.4.2.orig/soundserver/Makefile.in arts-1.4.2/soundserver/Makefile.in
+--- arts-1.4.2.orig/soundserver/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/soundserver/Makefile.in 2005-07-26 18:27:37.914703552 +0000
@@ -336,6 +336,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8114,9 +8458,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
artsversion-new.h: $(top_builddir)/config.status $(srcdir)/artsversion-new.h.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-diff -rua arts-1.4.1.orig/tests/Makefile.in arts-1.4.1/tests/Makefile.in
---- arts-1.4.1.orig/tests/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/tests/Makefile.in 2005-05-24 15:10:58.392329490 +0200
+diff -Nru arts-1.4.2.orig/tests/Makefile.in arts-1.4.2/tests/Makefile.in
+--- arts-1.4.2.orig/tests/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/tests/Makefile.in 2005-07-26 18:27:37.953697624 +0000
@@ -290,6 +290,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -8148,9 +8492,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -rua arts-1.4.1.orig/x11/Makefile.in arts-1.4.1/x11/Makefile.in
---- arts-1.4.1.orig/x11/Makefile.in 2005-05-23 17:36:50.000000000 +0200
-+++ arts-1.4.1/x11/Makefile.in 2005-05-24 15:10:58.401328679 +0200
+diff -Nru arts-1.4.2.orig/x11/Makefile.in arts-1.4.2/x11/Makefile.in
+--- arts-1.4.2.orig/x11/Makefile.in 2005-07-20 19:48:59.000000000 +0000
++++ arts-1.4.2/x11/Makefile.in 2005-07-26 18:27:37.972694736 +0000
@@ -238,6 +238,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
More information about the Pkg-kde-commits
mailing list