rev 4660 - trunk/packages/kdeaddons/debian/patches
Pierre Habouzit
madcoder at costa.debian.org
Mon Oct 9 23:36:16 UTC 2006
Author: madcoder
Date: 2006-10-09 23:36:09 +0000 (Mon, 09 Oct 2006)
New Revision: 4660
Modified:
trunk/packages/kdeaddons/debian/patches/98_buildprep.diff
Log:
buildprep
98_buildprep.diff | 9625 +++++++++++++++++++++++++++++++++++-------------------
1 file changed, 6385 insertions(+), 3240 deletions(-)
Modified: trunk/packages/kdeaddons/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeaddons/debian/patches/98_buildprep.diff 2006-10-09 23:32:17 UTC (rev 4659)
+++ trunk/packages/kdeaddons/debian/patches/98_buildprep.diff 2006-10-09 23:36:09 UTC (rev 4660)
@@ -1,7 +1,6 @@
-#DPATCHLEVEL=0
-# vi: ft=diff
---- acinclude.m4
-+++ acinclude.m4
+diff -ur kdeaddons-3.5.5.old/acinclude.m4 kdeaddons-3.5.5/acinclude.m4
+--- kdeaddons-3.5.5.old/acinclude.m4 2006-10-02 19:37:17.000000000 +0200
++++ kdeaddons-3.5.5/acinclude.m4 2006-10-10 01:33:45.000000000 +0200
@@ -1689,15 +1689,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -28,7 +27,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5973,30 +5961,15 @@
+@@ -5970,30 +5958,15 @@
fi
])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +63,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6056,7 +6029,7 @@
+@@ -6053,7 +6026,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -73,7 +72,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6106,7 +6079,7 @@
+@@ -6103,7 +6076,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -82,7 +81,7 @@
[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
# Same as above, but do not quote variable references.
-@@ -6126,7 +6099,7 @@
+@@ -6123,7 +6096,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -91,7 +90,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6146,6 +6119,7 @@
+@@ -6143,6 +6116,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -99,7 +98,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -6165,15 +6139,17 @@
+@@ -6162,15 +6136,17 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -119,7 +118,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -6214,11 +6190,56 @@
+@@ -6211,11 +6187,56 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -176,7 +175,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
# Links a minimal program and checks the executable
-@@ -6291,15 +6312,15 @@
+@@ -6288,15 +6309,15 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -195,7 +194,7 @@
(test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
then
break
-@@ -6468,14 +6489,13 @@
+@@ -6465,14 +6486,13 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +211,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6487,7 +6507,6 @@
+@@ -6484,7 +6504,6 @@
esac
;;
*64-bit*)
@@ -220,7 +219,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6521,6 +6540,22 @@
+@@ -6518,6 +6537,22 @@
CFLAGS="$SAVE_CFLAGS"
fi
;;
@@ -243,7 +242,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6552,7 +6587,7 @@
+@@ -6549,7 +6584,7 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -252,7 +251,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6562,8 +6597,10 @@
+@@ -6559,8 +6594,10 @@
echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -265,7 +264,7 @@
$2=yes
fi
fi
-@@ -6589,11 +6626,16 @@
+@@ -6586,11 +6623,16 @@
LDFLAGS="$LDFLAGS $3"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -283,7 +282,7 @@
else
$2=yes
fi
-@@ -6617,7 +6659,7 @@
+@@ -6614,7 +6656,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -292,7 +291,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6646,20 +6688,70 @@
+@@ -6643,20 +6685,70 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -369,7 +368,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.
-@@ -6676,7 +6768,7 @@
+@@ -6673,7 +6765,7 @@
# _LT_AC_CHECK_DLFCN
@@ -378,7 +377,7 @@
AC_DEFUN([_LT_AC_CHECK_DLFCN],
[AC_CHECK_HEADERS(dlfcn.h)dnl
])# _LT_AC_CHECK_DLFCN
-@@ -6684,7 +6776,7 @@
+@@ -6681,7 +6773,7 @@
# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -387,7 +386,7 @@
AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "$cross_compiling" = yes; then :
-@@ -6750,17 +6842,19 @@
+@@ -6747,17 +6839,19 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -409,7 +408,7 @@
esac
else :
# compilation failed
-@@ -6772,7 +6866,7 @@
+@@ -6769,7 +6863,7 @@
# AC_LIBTOOL_DLOPEN_SELF
@@ -418,7 +417,7 @@
AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
if test "x$enable_dlopen" != xyes; then
-@@ -6809,7 +6903,7 @@
+@@ -6806,7 +6900,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -427,7 +426,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6843,7 +6937,7 @@
+@@ -6840,7 +6934,7 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -436,7 +435,7 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6856,7 +6950,7 @@
+@@ -6853,7 +6947,7 @@
])
if test "x$lt_cv_dlopen_self" = xyes; then
@@ -445,7 +444,7 @@
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
_LT_AC_TRY_DLOPEN_SELF(
-@@ -6898,20 +6992,13 @@
+@@ -6895,20 +6989,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -467,7 +466,7 @@
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6923,13 +7010,18 @@
+@@ -6920,13 +7007,18 @@
then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -490,7 +489,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6988,8 +7080,8 @@
+@@ -6985,8 +7077,8 @@
[AC_MSG_CHECKING([how to hardcode library paths into programs])
_LT_AC_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -501,7 +500,7 @@
# We can hardcode non-existant directories.
if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7046,7 +7138,7 @@
+@@ -7043,7 +7135,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -510,7 +509,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -7059,7 +7151,7 @@
+@@ -7056,7 +7148,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -519,7 +518,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -7069,7 +7161,20 @@
+@@ -7066,7 +7158,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -541,7 +540,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -7134,7 +7239,7 @@
+@@ -7131,7 +7236,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +549,7 @@
;;
beos*)
-@@ -7143,7 +7248,7 @@
+@@ -7140,7 +7245,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -559,7 +558,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7159,7 +7264,7 @@
+@@ -7156,7 +7261,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -568,7 +567,7 @@
need_version=no
need_lib_prefix=no
-@@ -7171,7 +7276,8 @@
+@@ -7168,7 +7273,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +577,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -7201,7 +7307,7 @@
+@@ -7198,7 +7304,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +586,7 @@
;;
esac
;;
-@@ -7224,7 +7330,7 @@
+@@ -7221,7 +7327,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -596,7 +595,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"`
-@@ -7247,20 +7353,17 @@
+@@ -7244,20 +7350,17 @@
dynamic_linker=no
;;
@@ -628,7 +627,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -7278,14 +7381,19 @@
+@@ -7275,14 +7378,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -650,7 +649,7 @@
esac
;;
-@@ -7305,9 +7413,9 @@
+@@ -7302,9 +7410,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -662,7 +661,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7322,7 +7430,7 @@
+@@ -7319,7 +7427,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -671,7 +670,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7333,7 +7441,7 @@
+@@ -7330,7 +7438,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -680,7 +679,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7345,6 +7453,18 @@
+@@ -7342,6 +7450,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -699,7 +698,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -7388,29 +7508,26 @@
+@@ -7385,29 +7505,26 @@
;;
# This must be Linux ELF.
@@ -736,7 +735,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,
-@@ -7420,6 +7537,18 @@
+@@ -7417,6 +7534,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -755,7 +754,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7429,7 +7558,7 @@
+@@ -7426,7 +7555,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -764,7 +763,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7457,8 +7586,13 @@
+@@ -7454,8 +7583,13 @@
openbsd*)
version_type=sunos
@@ -779,7 +778,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
-@@ -7478,7 +7612,7 @@
+@@ -7475,7 +7609,7 @@
os2*)
libname_spec='$name'
@@ -788,7 +787,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7496,13 +7630,6 @@
+@@ -7493,13 +7627,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -802,7 +801,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -7528,7 +7655,7 @@
+@@ -7525,7 +7652,7 @@
need_version=yes
;;
@@ -811,7 +810,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -7561,6 +7688,29 @@
+@@ -7558,6 +7685,29 @@
fi
;;
@@ -841,7 +840,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7574,6 +7724,11 @@
+@@ -7571,6 +7721,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +852,7 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -7598,6 +7753,9 @@
+@@ -7595,6 +7750,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -863,7 +862,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -7624,7 +7782,9 @@
+@@ -7621,7 +7779,9 @@
case $tagname in
CXX)
@@ -874,7 +873,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -7686,7 +7846,7 @@
+@@ -7683,7 +7843,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -883,7 +882,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -7724,7 +7884,7 @@
+@@ -7721,7 +7881,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -892,7 +891,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -7860,7 +8020,7 @@
+@@ -7857,7 +8017,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -901,7 +900,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -7970,7 +8130,7 @@
+@@ -7967,7 +8127,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -910,7 +909,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -8002,7 +8162,7 @@
+@@ -7999,7 +8159,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -919,7 +918,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -8029,6 +8189,15 @@
+@@ -8026,6 +8186,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +934,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -8062,44 +8231,36 @@
+@@ -8059,44 +8228,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -991,7 +990,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -8115,7 +8276,7 @@
+@@ -8112,7 +8273,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -1000,7 +999,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -8131,43 +8292,27 @@
+@@ -8128,43 +8289,27 @@
esac
;;
@@ -1057,7 +1056,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
-@@ -8186,32 +8331,22 @@
+@@ -8183,32 +8328,22 @@
;;
openbsd*)
@@ -1093,7 +1092,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -8232,10 +8367,13 @@
+@@ -8229,10 +8364,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1108,7 +1107,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -8255,36 +8393,43 @@
+@@ -8252,36 +8390,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1176,7 +1175,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -8316,13 +8461,13 @@
+@@ -8313,13 +8458,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1196,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -8341,13 +8486,13 @@
+@@ -8338,13 +8483,13 @@
# -----------------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
@@ -1218,7 +1217,7 @@
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8385,10 +8530,21 @@
+@@ -8382,10 +8527,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1240,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -8428,7 +8584,7 @@
+@@ -8425,7 +8581,7 @@
# AC_LIBTOOL_RC
@@ -1250,7 +1249,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8461,36 +8617,9 @@
+@@ -8458,36 +8614,9 @@
_LT_AC_SYS_COMPILER
@@ -1290,7 +1289,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -8504,9 +8633,9 @@
+@@ -8501,9 +8630,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1302,7 +1301,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -8515,7 +8644,7 @@
+@@ -8512,7 +8641,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1311,7 +1310,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -8524,48 +8653,11 @@
+@@ -8521,48 +8650,11 @@
fi
;;
@@ -1362,7 +1361,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8590,7 +8682,7 @@
+@@ -8587,7 +8679,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1371,7 +1370,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8602,6 +8694,7 @@
+@@ -8599,6 +8691,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1378,7 @@
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8619,7 +8712,7 @@
+@@ -8616,7 +8709,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1388,7 +1387,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -8629,11 +8722,15 @@
+@@ -8626,11 +8719,15 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -1405,7 +1404,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -8644,18 +8741,18 @@
+@@ -8641,18 +8738,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1427,7 +1426,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -8673,8 +8770,8 @@
+@@ -8670,8 +8767,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
@@ -1438,7 +1437,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8700,7 +8797,7 @@
+@@ -8697,7 +8794,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.
@@ -1447,7 +1446,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8730,8 +8827,23 @@
+@@ -8727,8 +8824,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1473,7 +1472,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8748,7 +8860,7 @@
+@@ -8745,7 +8857,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1482,7 +1481,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -8767,8 +8879,12 @@
+@@ -8764,8 +8876,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1495,7 +1494,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -8777,15 +8893,16 @@
+@@ -8774,15 +8890,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1516,7 +1515,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.
-@@ -8794,13 +8911,12 @@
+@@ -8791,13 +8908,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -1532,7 +1531,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8809,22 +8925,32 @@
+@@ -8806,22 +8922,32 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1576,7 +1575,7 @@
esac
;;
-@@ -8832,12 +8958,12 @@
+@@ -8829,12 +8955,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'
@@ -1591,7 +1590,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
-@@ -8846,70 +8972,81 @@
+@@ -8843,70 +8969,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1725,7 +1724,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8920,14 +9057,14 @@
+@@ -8917,14 +9054,14 @@
;;
esac
;;
@@ -1742,7 +1741,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8944,12 +9081,12 @@
+@@ -8941,12 +9078,12 @@
# location of the library.
case $cc_basename in
@@ -1758,7 +1757,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8958,11 +9095,11 @@
+@@ -8955,11 +9092,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.
@@ -1772,7 +1771,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,34 +9109,23 @@
+@@ -8969,34 +9106,23 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1814,7 +1813,7 @@
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9009,17 +9135,20 @@
+@@ -9006,17 +9132,20 @@
esac
case $cc_basename in
@@ -1841,7 +1840,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -9035,12 +9164,15 @@
+@@ -9032,12 +9161,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1861,7 +1860,7 @@
;;
esac
fi
-@@ -9051,11 +9183,25 @@
+@@ -9048,11 +9180,25 @@
;;
esac
;;
@@ -1889,7 +1888,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -9066,9 +9212,9 @@
+@@ -9063,9 +9209,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -1901,7 +1900,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9077,16 +9223,16 @@
+@@ -9074,16 +9220,16 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -1922,7 +1921,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -9104,20 +9250,44 @@
+@@ -9101,20 +9247,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1973,7 +1972,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9145,7 +9315,7 @@
+@@ -9142,7 +9312,7 @@
;;
mvs*)
case $cc_basename in
@@ -1982,7 +1981,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -9155,7 +9325,7 @@
+@@ -9152,7 +9322,7 @@
;;
esac
;;
@@ -1991,7 +1990,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=
-@@ -9166,15 +9336,31 @@
+@@ -9163,15 +9333,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -2025,7 +2024,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9184,14 +9370,14 @@
+@@ -9181,14 +9367,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -2043,7 +2042,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9209,7 +9395,7 @@
+@@ -9206,7 +9392,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2051,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9228,13 +9414,13 @@
+@@ -9225,13 +9411,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -2068,7 +2067,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9243,17 +9429,17 @@
+@@ -9240,17 +9426,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -2090,7 +2089,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9272,7 +9458,7 @@
+@@ -9269,7 +9455,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2098,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9293,27 +9479,14 @@
+@@ -9290,27 +9476,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -2129,7 +2128,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9326,36 +9499,33 @@
+@@ -9323,36 +9496,33 @@
;;
solaris*)
case $cc_basename in
@@ -2178,7 +2177,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -9363,9 +9533,9 @@
+@@ -9360,9 +9530,9 @@
# in the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
@@ -2190,7 +2189,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9375,9 +9545,9 @@
+@@ -9372,9 +9542,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
@@ -2202,7 +2201,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9386,9 +9556,9 @@
+@@ -9383,9 +9553,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -2214,7 +2213,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9401,12 +9571,63 @@
+@@ -9398,12 +9568,63 @@
;;
esac
;;
@@ -2280,7 +2279,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9443,8 +9664,6 @@
+@@ -9440,8 +9661,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2289,7 +2288,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9462,7 +9681,7 @@
+@@ -9459,7 +9678,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2298,7 +2297,7 @@
# Figure out "hidden" library dependencies from verbose
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
-@@ -9516,7 +9735,7 @@
+@@ -9513,7 +9732,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -2307,7 +2306,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -9556,7 +9775,7 @@
+@@ -9553,7 +9772,7 @@
fi
;;
@@ -2316,7 +2315,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9592,13 +9811,37 @@
+@@ -9589,13 +9808,37 @@
$rm -f confest.$objext
@@ -2355,7 +2354,7 @@
# Ensure that the configuration vars for the C compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9642,12 +9885,16 @@
+@@ -9639,12 +9882,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2373,7 +2372,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -9657,7 +9904,7 @@
+@@ -9654,7 +9901,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2382,7 +2381,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -9665,8 +9912,10 @@
+@@ -9662,8 +9909,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2395,7 +2394,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -9676,8 +9925,6 @@
+@@ -9673,8 +9922,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2404,7 +2403,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -9687,8 +9934,6 @@
+@@ -9684,8 +9931,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2413,7 +2412,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9717,20 +9962,27 @@
+@@ -9714,20 +9959,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -2442,7 +2441,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -9742,8 +9994,6 @@
+@@ -9739,8 +9991,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2451,7 +2450,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -9753,7 +10003,7 @@
+@@ -9750,7 +10000,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2460,7 +2459,7 @@
# Ensure that the configuration vars for the Windows resource compiler are
# suitably defined. Those variables are subsequently used by
# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9777,11 +10027,16 @@
+@@ -9774,11 +10024,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2477,7 +2476,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -9807,11 +10062,12 @@
+@@ -9804,11 +10059,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2492,7 +2491,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 \
-@@ -9861,7 +10117,7 @@
+@@ -9858,7 +10114,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2501,7 +2500,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9927,11 +10183,11 @@
+@@ -9924,11 +10180,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2515,7 +2514,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -9962,6 +10218,12 @@
+@@ -9959,6 +10215,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2528,7 +2527,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -9973,6 +10235,9 @@
+@@ -9970,6 +10232,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2538,7 +2537,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -9992,7 +10257,7 @@
+@@ -9989,7 +10254,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2547,7 +2546,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -10023,7 +10288,7 @@
+@@ -10020,7 +10285,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2556,7 +2555,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10038,7 +10303,7 @@
+@@ -10035,7 +10300,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
@@ -2565,7 +2564,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -10267,7 +10532,10 @@
+@@ -10264,7 +10529,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.
@@ -2577,7 +2576,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10309,9 +10577,6 @@
+@@ -10306,9 +10574,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2587,7 +2586,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -10333,14 +10598,30 @@
+@@ -10330,14 +10595,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -2620,7 +2619,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10358,14 +10639,17 @@
+@@ -10355,14 +10636,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2640,7 +2639,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -10521,6 +10805,10 @@
+@@ -10518,6 +10802,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2651,7 +2650,7 @@
sysv4*MP*)
if test -d /usr/nec; then
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10529,7 +10817,7 @@
+@@ -10526,7 +10814,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2660,7 +2659,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -10554,18 +10842,28 @@
+@@ -10551,18 +10839,28 @@
;;
chorus*)
case $cc_basename in
@@ -2692,7 +2691,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10573,22 +10871,22 @@
+@@ -10570,22 +10868,22 @@
;;
esac
;;
@@ -2721,7 +2720,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10601,9 +10899,13 @@
+@@ -10598,9 +10896,13 @@
;;
esac
;;
@@ -2736,7 +2735,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -10612,20 +10914,26 @@
+@@ -10609,20 +10911,26 @@
;;
esac
;;
@@ -2768,7 +2767,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10642,25 +10950,25 @@
+@@ -10639,25 +10947,25 @@
;;
mvs*)
case $cc_basename in
@@ -2799,7 +2798,7 @@
# Digital/Compaq C++
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10674,24 +10982,15 @@
+@@ -10671,24 +10979,15 @@
;;
psos*)
;;
@@ -2826,7 +2825,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -10701,12 +11000,12 @@
+@@ -10698,12 +10997,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2841,7 +2840,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -10716,7 +11015,7 @@
+@@ -10713,7 +11012,7 @@
;;
tandem*)
case $cc_basename in
@@ -2850,7 +2849,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -10724,7 +11023,14 @@
+@@ -10721,7 +11020,14 @@
;;
esac
;;
@@ -2866,7 +2865,7 @@
;;
vxworks*)
;;
-@@ -10771,6 +11077,11 @@
+@@ -10768,6 +11074,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2878,7 +2877,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -10787,7 +11098,7 @@
+@@ -10784,7 +11095,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2887,7 +2886,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10813,6 +11124,16 @@
+@@ -10810,6 +11121,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2904,7 +2903,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -10824,7 +11145,7 @@
+@@ -10821,7 +11142,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2913,7 +2912,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -10847,13 +11168,20 @@
+@@ -10844,13 +11165,20 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2936,7 +2935,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -10868,15 +11196,15 @@
+@@ -10865,15 +11193,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -2958,7 +2957,7 @@
;;
sunos4*)
-@@ -10885,7 +11213,7 @@
+@@ -10882,7 +11210,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2967,7 +2966,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)='-Bstatic'
-@@ -10898,6 +11226,17 @@
+@@ -10895,6 +11223,17 @@
fi
;;
@@ -2985,7 +2984,7 @@
uts4*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10925,7 +11264,7 @@
+@@ -10922,7 +11261,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2994,7 +2993,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10934,6 +11273,16 @@
+@@ -10931,6 +11270,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -3011,7 +3010,7 @@
])
-@@ -10958,7 +11307,10 @@
+@@ -10955,7 +11304,10 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -3023,7 +3022,7 @@
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10984,7 +11336,7 @@
+@@ -10981,7 +11333,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -3032,7 +3031,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*
-@@ -11001,7 +11353,8 @@
+@@ -10998,7 +11350,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -3042,7 +3041,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11011,6 +11364,10 @@
+@@ -11008,6 +11361,10 @@
with_gnu_ld=no
fi
;;
@@ -3053,7 +3052,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -11021,6 +11378,27 @@
+@@ -11018,6 +11375,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -3081,7 +3080,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -11058,7 +11436,7 @@
+@@ -11055,7 +11433,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
@@ -3090,7 +3089,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -11068,13 +11446,13 @@
+@@ -11065,13 +11443,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'
@@ -3107,7 +3106,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
-@@ -11083,23 +11461,70 @@
+@@ -11080,23 +11458,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -3184,7 +3183,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<EOF 1>&2
-@@ -11113,13 +11538,40 @@
+@@ -11110,13 +11535,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3227,7 +3226,7 @@
sunos4*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -11129,24 +11581,19 @@
+@@ -11126,24 +11578,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3259,7 +3258,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11158,7 +11605,7 @@
+@@ -11155,7 +11602,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3268,7 +3267,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11180,9 +11627,21 @@
+@@ -11177,9 +11624,21 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -3292,7 +3291,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11199,7 +11658,7 @@
+@@ -11196,7 +11655,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3301,7 +3300,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -11218,8 +11677,12 @@
+@@ -11215,8 +11674,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3314,7 +3313,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -11227,30 +11690,30 @@
+@@ -11224,30 +11687,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3356,7 +3355,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11259,13 +11722,11 @@
+@@ -11256,13 +11719,11 @@
# -berok will link without error, but may produce a broken library.
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3373,7 +3372,7 @@
fi
fi
;;
-@@ -11278,7 +11739,7 @@
+@@ -11275,7 +11736,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3382,7 +3381,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -11288,69 +11749,69 @@
+@@ -11285,69 +11746,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3497,7 @@
;;
dgux*)
-@@ -11383,8 +11844,8 @@
+@@ -11380,8 +11841,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3509,7 +3508,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
-@@ -11392,7 +11853,7 @@
+@@ -11389,7 +11850,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -3518,7 +3517,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
-@@ -11406,47 +11867,62 @@
+@@ -11403,47 +11864,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3605,7 +3604,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -11460,7 +11936,7 @@
+@@ -11457,7 +11933,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -3614,7 +3613,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'
-@@ -11470,7 +11946,7 @@
+@@ -11467,7 +11943,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -3623,7 +3622,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
-@@ -11493,7 +11969,8 @@
+@@ -11490,7 +11966,8 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3633,7 +3632,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11503,7 +11980,7 @@
+@@ -11500,7 +11977,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -3642,7 +3641,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11514,14 +11991,14 @@
+@@ -11511,14 +11988,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
@@ -3659,7 +3658,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'
-@@ -11533,13 +12010,13 @@
+@@ -11530,13 +12007,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3675,7 +3674,7 @@
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11547,21 +12024,15 @@
+@@ -11544,21 +12021,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3701,7 +3700,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11570,8 +12041,18 @@
+@@ -11567,8 +12038,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3722,7 +3721,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -11580,7 +12061,7 @@
+@@ -11577,7 +12058,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.
@@ -3731,7 +3730,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11628,36 +12109,45 @@
+@@ -11625,36 +12106,45 @@
fi
;;
@@ -3798,7 +3797,7 @@
;;
uts4*)
-@@ -11675,11 +12165,6 @@
+@@ -11672,11 +12162,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3810,7 +3809,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -11700,13 +12185,14 @@
+@@ -11697,13 +12182,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3825,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -11834,7 +12320,7 @@
+@@ -11831,7 +12317,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3835,8 +3834,9 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
-+++ aclocal.m4
+diff -ur kdeaddons-3.5.5.old/aclocal.m4 kdeaddons-3.5.5/aclocal.m4
+--- kdeaddons-3.5.5.old/aclocal.m4 2006-10-02 19:37:29.000000000 +0200
++++ kdeaddons-3.5.5/aclocal.m4 2006-10-10 01:34:02.000000000 +0200
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -3873,8 +3873,9 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
---- atlantikdesigner/designer/Makefile.in
-+++ atlantikdesigner/designer/Makefile.in
+diff -ur kdeaddons-3.5.5.old/atlantikdesigner/designer/Makefile.in kdeaddons-3.5.5/atlantikdesigner/designer/Makefile.in
+--- kdeaddons-3.5.5.old/atlantikdesigner/designer/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/atlantikdesigner/designer/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -146,6 +146,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -3960,6 +3961,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -405,9 +414,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atlantikdesigner/designer/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atlantikdesigner/designer/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign atlantikdesigner/designer/Makefile
++#>- $(AUTOMAKE) --gnu atlantikdesigner/designer/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atlantikdesigner/designer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atlantikdesigner/designer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign atlantikdesigner/designer/Makefile
++ $(AUTOMAKE) --gnu atlantikdesigner/designer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit atlantikdesigner/designer/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -434,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3972,65 +3997,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -802,18 +811,18 @@
- mocs: group.moc
+@@ -842,9 +851,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atlantikdesigner/designer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atlantikdesigner/designer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign atlantikdesigner/designer/Makefile
++ $(AUTOMAKE) --gnu atlantikdesigner/designer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit atlantikdesigner/designer/Makefile.in
- #>+ 3
--editor.moc: $(srcdir)/editor.h
-- $(MOC) $(srcdir)/editor.h -o editor.moc
-+boardinfo.moc: $(srcdir)/boardinfo.h
-+ $(MOC) $(srcdir)/boardinfo.h -o boardinfo.moc
- #>+ 2
--mocs: editor.moc
-+mocs: boardinfo.moc
-
- #>+ 3
--boardinfo.moc: $(srcdir)/boardinfo.h
-- $(MOC) $(srcdir)/boardinfo.h -o boardinfo.moc
-+editor.moc: $(srcdir)/editor.h
-+ $(MOC) $(srcdir)/editor.h -o editor.moc
-
- #>+ 2
--mocs: boardinfo.moc
-+mocs: editor.moc
-
- #>+ 3
- designer.moc: $(srcdir)/designer.h
-@@ -824,10 +833,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f group.moc editor.moc boardinfo.moc designer.moc
-+ -rm -f group.moc boardinfo.moc editor.moc designer.moc
-
- #>+ 2
--KDE_DIST=editor.h Makefile.in designer.h Makefile.am group.h boardinfo.h
-+KDE_DIST=Makefile.in group.h editor.h designer.h Makefile.am boardinfo.h
-
- #>+ 2
- docs-am:
-@@ -871,7 +880,7 @@
-
-
- #>+ 11
--atlantikdesigner.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/boardinfo.cpp $(srcdir)/designer.cpp $(srcdir)/editor.cpp $(srcdir)/main.cpp $(srcdir)/group.cpp group.moc boardinfo.moc editor.moc designer.moc
-+atlantikdesigner.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/boardinfo.cpp $(srcdir)/designer.cpp $(srcdir)/editor.cpp $(srcdir)/main.cpp $(srcdir)/group.cpp group.moc editor.moc boardinfo.moc designer.moc
- @echo 'creating atlantikdesigner.all_cpp.cpp ...'; \
- rm -f atlantikdesigner.all_cpp.files atlantikdesigner.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> atlantikdesigner.all_cpp.final; \
-@@ -908,8 +917,8 @@
-
- #>+ 11
- nmcheck:
--boardinfo.o: boardinfo.moc
- editor.o: editor.moc
-+boardinfo.o: boardinfo.moc
- editor.lo: editor.moc
- nmcheck-am: nmcheck
- designer.lo: designer.moc
---- atlantikdesigner/Makefile.in
-+++ atlantikdesigner/Makefile.in
+diff -ur kdeaddons-3.5.5.old/atlantikdesigner/Makefile.in kdeaddons-3.5.5/atlantikdesigner/Makefile.in
+--- kdeaddons-3.5.5.old/atlantikdesigner/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/atlantikdesigner/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -119,6 +119,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -4116,6 +4097,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -379,9 +388,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atlantikdesigner/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atlantikdesigner/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign atlantikdesigner/Makefile
++#>- $(AUTOMAKE) --gnu atlantikdesigner/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -391,9 +400,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atlantikdesigner/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atlantikdesigner/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign atlantikdesigner/Makefile
++ $(AUTOMAKE) --gnu atlantikdesigner/Makefile
+ cd $(top_srcdir) && perl admin/am_edit atlantikdesigner/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -408,9 +417,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4128,8 +4133,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- atlantikdesigner/pics/Makefile.in
-+++ atlantikdesigner/pics/Makefile.in
+@@ -754,9 +763,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atlantikdesigner/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atlantikdesigner/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign atlantikdesigner/Makefile
++ $(AUTOMAKE) --gnu atlantikdesigner/Makefile
+ cd $(top_srcdir) && perl admin/am_edit atlantikdesigner/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/atlantikdesigner/pics/Makefile.in kdeaddons-3.5.5/atlantikdesigner/pics/Makefile.in
+--- kdeaddons-3.5.5.old/atlantikdesigner/pics/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/atlantikdesigner/pics/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -92,6 +92,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -4215,6 +4233,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -345,9 +354,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atlantikdesigner/pics/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atlantikdesigner/pics/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign atlantikdesigner/pics/Makefile
++#>- $(AUTOMAKE) --gnu atlantikdesigner/pics/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -357,9 +366,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atlantikdesigner/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atlantikdesigner/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign atlantikdesigner/pics/Makefile
++ $(AUTOMAKE) --gnu atlantikdesigner/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit atlantikdesigner/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -374,9 +383,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4227,17 +4269,22 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -519,7 +528,7 @@
- .NOEXPORT:
+@@ -545,9 +554,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atlantikdesigner/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu atlantikdesigner/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign atlantikdesigner/pics/Makefile
++ $(AUTOMAKE) --gnu atlantikdesigner/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit atlantikdesigner/pics/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in hi16-app-atlantikdesigner.png hi32-app-atlantikdesigner.png Makefile.am
-+KDE_DIST=Makefile.in hi16-app-atlantikdesigner.png Makefile.am hi32-app-atlantikdesigner.png
- #>+ 2
- docs-am:
---- config.h.in
-+++ config.h.in
+Seulement dans kdeaddons-3.5.5: autom4te.cache
+diff -ur kdeaddons-3.5.5.old/config.h.in kdeaddons-3.5.5/config.h.in
+--- kdeaddons-3.5.5.old/config.h.in 2006-10-02 19:37:36.000000000 +0200
++++ kdeaddons-3.5.5/config.h.in 2006-10-10 01:34:11.000000000 +0200
@@ -135,22 +135,22 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
@@ -4267,13 +4314,15 @@
#undef SIZEOF_UNSIGNED_LONG
/* Define to 1 if you have the ANSI C header files. */
---- configure
-+++ configure
+Seulement dans kdeaddons-3.5.5: config.h.in~
+diff -ur kdeaddons-3.5.5.old/configure kdeaddons-3.5.5/configure
+--- kdeaddons-3.5.5.old/configure 2006-10-02 19:38:33.000000000 +0200
++++ kdeaddons-3.5.5/configure 2006-10-10 01:34:10.000000000 +0200
@@ -1,8 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.60a.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -4963,19 +5012,53 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -455,17 +745,319 @@
+@@ -430,42 +720,344 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
#endif
- #if HAVE_INTTYPES_H
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ # include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
+#endif
-+#if HAVE_STDINT_H
-+# include <stdint.h>
- #endif
- #if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -5487,9 +5570,15 @@
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
--do
++# Be sure to have absolute directory names.
++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
++ datadir sysconfdir sharedstatedir localstatedir includedir \
++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++ libdir localedir mandir
+ do
- eval ac_val=$`echo $ac_var`
-- case $ac_val in
++ eval ac_val=\$$ac_var
+ case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -5499,15 +5588,9 @@
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+ datadir sysconfdir sharedstatedir localstatedir includedir \
-+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+ libdir localedir mandir
- do
+-do
- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
+- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -5904,7 +5987,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.60a
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -5923,7 +6006,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -6811,9 +6894,9 @@
KDECONFIG=$kde_cv_path
fi
-@@ -2271,16 +2958,16 @@
+@@ -2270,16 +2957,16 @@
+ fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
- echo "$as_me:$LINENO: checking where to install" >&5
-echo $ECHO_N "checking where to install... $ECHO_C" >&6
@@ -6834,7 +6917,7 @@
fi
# And delete superfluous '/' to make compares easier
-@@ -2293,13 +2980,13 @@
+@@ -2292,13 +2979,13 @@
@@ -6852,7 +6935,7 @@
val=
-@@ -2316,11 +3003,11 @@
+@@ -2315,11 +3002,11 @@
@@ -6866,7 +6949,7 @@
am_make=${MAKE-make}
-@@ -2330,8 +3017,8 @@
+@@ -2329,8 +3016,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6877,7 +6960,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2358,15 +3045,15 @@
+@@ -2357,15 +3044,15 @@
fi
@@ -6898,7 +6981,7 @@
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
-@@ -2386,10 +3073,9 @@
+@@ -2385,10 +3072,9 @@
@@ -6911,7 +6994,7 @@
case $enableval in
yes)
kde_use_debug_code="yes"
-@@ -2409,18 +3095,18 @@
+@@ -2408,18 +3094,18 @@
kde_use_debug_code="no"
kde_use_debug_define=no
@@ -6937,7 +7020,7 @@
if test $enableval = "no"; then
kde_use_strict_options="no"
else
-@@ -2429,12 +3115,12 @@
+@@ -2428,12 +3114,12 @@
else
kde_use_strict_options="no"
@@ -6954,7 +7037,7 @@
if test $enableval = "no"; then
kde_use_warnings="no"
else
-@@ -2443,20 +3129,21 @@
+@@ -2442,20 +3128,21 @@
else
kde_use_warnings="yes"
@@ -6981,7 +7064,7 @@
CFLAGS=" $CFLAGS"
-@@ -2468,8 +3155,8 @@
+@@ -2467,8 +3154,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -6992,7 +7075,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2482,32 +3169,34 @@
+@@ -2481,32 +3168,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7034,7 +7117,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2520,36 +3209,51 @@
+@@ -2519,36 +3208,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7096,7 +7179,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2562,74 +3266,34 @@
+@@ -2561,74 +3265,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7180,7 +7263,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2643,7 +3307,7 @@
+@@ -2642,7 +3306,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7189,7 +7272,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -2654,6 +3318,7 @@
+@@ -2653,6 +3317,7 @@
fi
done
done
@@ -7197,7 +7280,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -2671,22 +3336,23 @@
+@@ -2670,22 +3335,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7228,7 +7311,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2699,36 +3365,38 @@
+@@ -2698,36 +3364,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7275,7 +7358,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2741,29 +3409,45 @@
+@@ -2740,29 +3408,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7327,7 +7410,7 @@
fi
fi
-@@ -2776,21 +3460,35 @@
+@@ -2775,21 +3459,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -7371,7 +7454,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2815,46 +3513,70 @@
+@@ -2814,47 +3512,77 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -7425,7 +7508,7 @@
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
-+for ac_file in $ac_files
++for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -7462,16 +7545,21 @@
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
++ ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2867,19 +3589,23 @@
+
+@@ -2866,19 +3594,21 @@
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
@@ -7495,7 +7583,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2898,22 +3624,27 @@
+@@ -2897,22 +3627,27 @@
fi
fi
fi
@@ -7535,7 +7623,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2924,9 +3655,8 @@
+@@ -2923,9 +3658,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -7546,7 +7634,7 @@
break;;
* ) break;;
esac
-@@ -2940,14 +3670,14 @@
+@@ -2939,14 +3673,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -7565,7 +7653,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2967,14 +3697,20 @@
+@@ -2966,14 +3700,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -7590,7 +7678,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2992,12 +3728,12 @@
+@@ -2991,12 +3731,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -7607,7 +7695,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3020,24 +3756,36 @@
+@@ -3019,24 +3759,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7652,7 +7740,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3046,24 +3794,28 @@
+@@ -3045,24 +3797,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7689,7 +7777,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3079,24 +3831,36 @@
+@@ -3078,24 +3834,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7734,7 +7822,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3105,285 +3869,278 @@
+@@ -3104,285 +3872,278 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8197,7 +8285,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3392,8 +4149,8 @@
+@@ -3391,8 +4152,8 @@
depcc="$CC" am_compiler_list=
@@ -8208,7 +8296,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3482,8 +4239,8 @@
+@@ -3481,8 +4242,8 @@
fi
fi
@@ -8219,7 +8307,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3505,8 +4262,8 @@
+@@ -3504,8 +4265,8 @@
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
@@ -8230,7 +8318,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -3540,8 +4297,13 @@
+@@ -3539,8 +4300,13 @@
#endif
Syntax error
_ACEOF
@@ -8246,7 +8334,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3566,9 +4328,10 @@
+@@ -3565,9 +4331,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8258,7 +8346,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3578,8 +4341,13 @@
+@@ -3577,8 +4344,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8274,7 +8362,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3606,6 +4374,7 @@
+@@ -3605,6 +4377,7 @@
ac_preproc_ok=:
break
fi
@@ -8282,7 +8370,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3623,8 +4392,8 @@
+@@ -3622,8 +4395,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -8293,7 +8381,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -3647,8 +4416,13 @@
+@@ -3646,8 +4419,13 @@
#endif
Syntax error
_ACEOF
@@ -8309,7 +8397,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3673,9 +4447,10 @@
+@@ -3672,9 +4450,10 @@
# Broken: fails on valid input.
continue
fi
@@ -8321,7 +8409,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3685,8 +4460,13 @@
+@@ -3684,8 +4463,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -8337,7 +8425,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -3713,6 +4493,7 @@
+@@ -3712,6 +4496,7 @@
ac_preproc_ok=:
break
fi
@@ -8345,7 +8433,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -3763,18 +4544,22 @@
+@@ -3762,18 +4547,22 @@
CXXFLAGS=" $CXXFLAGS"
@@ -8373,7 +8461,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3787,36 +4572,38 @@
+@@ -3786,36 +4575,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8420,7 +8508,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3829,55 +4616,85 @@
+@@ -3828,55 +4619,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8524,7 +8612,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3900,24 +4717,36 @@
+@@ -3899,24 +4720,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8569,7 +8657,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3926,24 +4755,28 @@
+@@ -3925,24 +4758,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8606,7 +8694,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3959,24 +4792,36 @@
+@@ -3958,24 +4795,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8651,7 +8739,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3985,70 +4830,53 @@
+@@ -3984,70 +4833,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8746,7 +8834,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4057,61 +4885,91 @@
+@@ -4056,61 +4888,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8832,12 +8920,12 @@
- echo '#endif' >>confdefs.h
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8860,7 +8948,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4120,8 +4978,8 @@
+@@ -4119,8 +4981,8 @@
depcc="$CXX" am_compiler_list=
@@ -8871,7 +8959,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4210,8 +5068,8 @@
+@@ -4209,8 +5071,8 @@
fi
fi
@@ -8882,7 +8970,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -4229,8 +5087,8 @@
+@@ -4228,8 +5090,8 @@
@@ -8893,7 +8981,7 @@
cat >conftest.$ac_ext <<_ACEOF
-@@ -4255,24 +5113,36 @@
+@@ -4254,24 +5116,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8938,7 +9026,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4281,13 +5151,14 @@
+@@ -4280,13 +5154,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8957,7 +9045,7 @@
if test "$kde_bad_compiler" = "yes"; then
{ { echo "$as_me:$LINENO: error:
-@@ -4329,17 +5200,16 @@
+@@ -4328,17 +5203,16 @@
fi
fi
@@ -8979,7 +9067,7 @@
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'
-@@ -4367,24 +5237,36 @@
+@@ -4366,24 +5240,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9024,7 +9112,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4393,8 +5275,10 @@
+@@ -4392,8 +5278,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9032,11 +9120,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4407,29 +5291,28 @@
+@@ -4406,29 +5294,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9074,7 +9162,7 @@
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'
-@@ -4456,24 +5339,36 @@
+@@ -4455,24 +5342,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9119,7 +9207,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4482,8 +5377,10 @@
+@@ -4481,8 +5380,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9127,11 +9215,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4496,13 +5393,13 @@
+@@ -4495,13 +5396,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9149,7 +9237,7 @@
:
WOVERLOADED_VRITUAL=""
fi
-@@ -4523,16 +5420,15 @@
+@@ -4522,16 +5423,15 @@
if test "$kde_use_profiling" = "yes"; then
@@ -9170,7 +9258,7 @@
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'
-@@ -4559,24 +5455,36 @@
+@@ -4558,24 +5458,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9215,7 +9303,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4585,8 +5493,10 @@
+@@ -4584,8 +5496,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9223,11 +9311,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4599,16 +5509,16 @@
+@@ -4598,16 +5512,16 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9248,7 +9336,7 @@
:
fi
-@@ -4623,16 +5533,15 @@
+@@ -4622,16 +5536,15 @@
CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
@@ -9269,7 +9357,7 @@
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'
-@@ -4659,24 +5568,36 @@
+@@ -4658,24 +5571,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9314,7 +9402,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4685,8 +5606,10 @@
+@@ -4684,8 +5609,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9322,11 +9410,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4699,27 +5622,26 @@
+@@ -4698,27 +5625,26 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9361,7 +9449,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4744,24 +5666,36 @@
+@@ -4743,24 +5669,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9406,7 +9494,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4770,8 +5704,10 @@
+@@ -4769,8 +5707,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9414,11 +9502,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$save_CFLAGS"
ac_ext=c
-@@ -4784,13 +5720,13 @@
+@@ -4783,13 +5723,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9436,7 +9524,7 @@
:
fi
-@@ -4798,16 +5734,15 @@
+@@ -4797,16 +5737,15 @@
;;
esac
@@ -9457,7 +9545,7 @@
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'
-@@ -4834,24 +5769,36 @@
+@@ -4833,24 +5772,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9502,7 +9590,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4860,8 +5807,10 @@
+@@ -4859,8 +5810,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9510,11 +9598,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4874,28 +5823,27 @@
+@@ -4873,28 +5826,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9551,7 +9639,7 @@
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'
-@@ -4922,24 +5870,36 @@
+@@ -4921,24 +5873,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9596,7 +9684,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4948,8 +5908,10 @@
+@@ -4947,8 +5911,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9604,11 +9692,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -4962,28 +5924,27 @@
+@@ -4961,28 +5927,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9645,7 +9733,7 @@
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'
-@@ -5010,24 +5971,36 @@
+@@ -5009,24 +5974,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9690,7 +9778,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5036,8 +6009,10 @@
+@@ -5035,8 +6012,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9698,11 +9786,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5050,13 +6025,13 @@
+@@ -5049,13 +6028,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9720,7 +9808,7 @@
:
fi
-@@ -5068,13 +6043,13 @@
+@@ -5067,13 +6046,13 @@
CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
fi
@@ -9738,7 +9826,7 @@
HAVE_GCC_VISIBILITY=0
-@@ -5082,16 +6057,15 @@
+@@ -5081,16 +6060,15 @@
if test "$GXX" = "yes"; then
gcc_no_reorder_blocks=NO
@@ -9759,7 +9847,7 @@
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'
-@@ -5118,24 +6092,36 @@
+@@ -5117,24 +6095,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9804,7 +9892,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5144,8 +6130,10 @@
+@@ -5143,8 +6133,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9812,11 +9900,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5158,13 +6146,13 @@
+@@ -5157,13 +6149,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9834,7 +9922,7 @@
:
fi
-@@ -5176,16 +6164,15 @@
+@@ -5175,16 +6167,15 @@
CFLAGS="$CFLAGS -fno-reorder-blocks"
fi
@@ -9855,7 +9943,7 @@
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'
-@@ -5212,24 +6199,36 @@
+@@ -5211,24 +6202,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9900,7 +9988,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5238,8 +6237,10 @@
+@@ -5237,8 +6240,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9908,11 +9996,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5252,28 +6253,27 @@
+@@ -5251,28 +6256,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9949,7 +10037,7 @@
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'
-@@ -5300,24 +6300,36 @@
+@@ -5299,24 +6303,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9994,7 +10082,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5326,8 +6338,10 @@
+@@ -5325,8 +6341,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10002,11 +10090,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5340,28 +6354,27 @@
+@@ -5339,28 +6357,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10043,7 +10131,7 @@
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'
-@@ -5388,24 +6401,36 @@
+@@ -5387,24 +6404,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10088,7 +10176,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5414,8 +6439,10 @@
+@@ -5413,8 +6442,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10096,11 +10184,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5428,28 +6455,27 @@
+@@ -5427,28 +6458,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10137,7 +10225,7 @@
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'
-@@ -5476,24 +6502,36 @@
+@@ -5475,24 +6505,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10182,7 +10270,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5502,8 +6540,10 @@
+@@ -5501,8 +6543,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10190,11 +10278,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5516,13 +6556,13 @@
+@@ -5515,13 +6559,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10212,7 +10300,7 @@
:
USE_EXCEPTIONS=
fi
-@@ -5530,37 +6570,37 @@
+@@ -5529,37 +6573,37 @@
ENABLE_PERMISSIVE_FLAG="-fpermissive"
if test "$kde_use_pch" = "yes"; then
@@ -10264,7 +10352,7 @@
if test "${kde_cv_opt_noinline_match+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5592,24 +6632,36 @@
+@@ -5591,24 +6635,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10309,7 +10397,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5618,18 +6670,19 @@
+@@ -5617,18 +6673,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10319,7 +10407,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_cflags_save"
@@ -10333,7 +10421,7 @@
if test "x$kde_cv_opt_noinline_match" = "xno" ; then
CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5649,16 +6702,15 @@
+@@ -5648,16 +6705,15 @@
if test "$kde_use_pch" = "yes"; then
@@ -10354,7 +10442,7 @@
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'
-@@ -5685,24 +6737,36 @@
+@@ -5684,24 +6740,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10399,7 +10487,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5711,8 +6775,10 @@
+@@ -5710,8 +6778,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10407,11 +10495,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5725,29 +6791,28 @@
+@@ -5724,29 +6794,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10449,7 +10537,7 @@
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'
-@@ -5774,24 +6839,36 @@
+@@ -5773,24 +6842,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10494,7 +10582,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5800,8 +6877,10 @@
+@@ -5799,8 +6880,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10502,11 +10590,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5814,28 +6893,27 @@
+@@ -5813,28 +6896,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10543,7 +10631,7 @@
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'
-@@ -5862,24 +6940,36 @@
+@@ -5861,24 +6943,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10588,7 +10676,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5888,8 +6978,10 @@
+@@ -5887,8 +6981,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10596,11 +10684,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5902,28 +6994,27 @@
+@@ -5901,28 +6997,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10637,7 +10725,7 @@
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'
-@@ -5950,24 +7041,36 @@
+@@ -5949,24 +7044,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10682,7 +10770,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5976,8 +7079,10 @@
+@@ -5975,8 +7082,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10690,11 +10778,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -5990,28 +7095,27 @@
+@@ -5989,28 +7098,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10731,7 +10819,7 @@
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'
-@@ -6038,24 +7142,36 @@
+@@ -6037,24 +7145,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10776,7 +10864,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6064,8 +7180,10 @@
+@@ -6063,8 +7183,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10784,11 +10872,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6078,28 +7196,27 @@
+@@ -6077,28 +7199,27 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10825,7 +10913,7 @@
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'
-@@ -6126,24 +7243,36 @@
+@@ -6125,24 +7246,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10870,7 +10958,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6152,8 +7281,10 @@
+@@ -6151,8 +7284,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10878,11 +10966,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6166,13 +7297,13 @@
+@@ -6165,13 +7300,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10900,7 +10988,7 @@
:
fi
-@@ -6279,13 +7410,13 @@
+@@ -6278,13 +7413,13 @@
fi
@@ -10917,7 +11005,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6315,8 +7446,13 @@
+@@ -6314,8 +7449,13 @@
#endif
Syntax error
_ACEOF
@@ -10933,7 +11021,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6341,9 +7477,10 @@
+@@ -6340,9 +7480,10 @@
# Broken: fails on valid input.
continue
fi
@@ -10945,7 +11033,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6353,8 +7490,13 @@
+@@ -6352,8 +7493,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -10961,7 +11049,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6381,6 +7523,7 @@
+@@ -6380,6 +7526,7 @@
ac_preproc_ok=:
break
fi
@@ -10969,7 +11057,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6398,8 +7541,8 @@
+@@ -6397,8 +7544,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -10980,7 +11068,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -6422,8 +7565,13 @@
+@@ -6421,8 +7568,13 @@
#endif
Syntax error
_ACEOF
@@ -10996,7 +11084,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6448,9 +7596,10 @@
+@@ -6447,9 +7599,10 @@
# Broken: fails on valid input.
continue
fi
@@ -11008,7 +11096,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -6460,8 +7609,13 @@
+@@ -6459,8 +7612,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -11024,7 +11112,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -6488,6 +7642,7 @@
+@@ -6487,6 +7645,7 @@
ac_preproc_ok=:
break
fi
@@ -11032,7 +11120,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -6514,16 +7669,15 @@
+@@ -6513,16 +7672,15 @@
NOOPT_CFLAGS=-O0
fi
@@ -11053,7 +11141,7 @@
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'
-@@ -6550,24 +7704,36 @@
+@@ -6549,24 +7707,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11098,7 +11186,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6576,8 +7742,10 @@
+@@ -6575,8 +7745,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11106,11 +11194,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6590,22 +7758,21 @@
+@@ -6589,22 +7761,21 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11139,7 +11227,7 @@
if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
ac_coverage_linker="-lgcc"
-@@ -6621,36 +7788,36 @@
+@@ -6620,36 +7791,36 @@
CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
LDFLAGS="$LDFLAGS $ac_coverage_linker"
@@ -11186,7 +11274,7 @@
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'
-@@ -6677,24 +7844,36 @@
+@@ -6676,24 +7847,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11231,7 +11319,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6703,8 +7882,10 @@
+@@ -6702,8 +7885,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11239,11 +11327,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6717,29 +7898,28 @@
+@@ -6716,29 +7901,28 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11281,7 +11369,7 @@
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'
-@@ -6766,24 +7946,36 @@
+@@ -6765,24 +7949,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11326,7 +11414,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -6792,8 +7984,10 @@
+@@ -6791,8 +7987,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11334,11 +11422,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -6806,13 +8000,13 @@
+@@ -6805,13 +8003,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11356,7 +11444,7 @@
:
fi
-@@ -6822,13 +8016,13 @@
+@@ -6821,13 +8019,13 @@
@@ -11374,7 +11462,7 @@
if test "x$kde_use_final" = "xyes"; then
KDE_USE_FINAL_TRUE=""
-@@ -6841,13 +8035,13 @@
+@@ -6840,13 +8038,13 @@
@@ -11392,7 +11480,7 @@
KDE_NO_UNDEFINED=""
if test "x$kde_use_closure" = "xyes"; then
-@@ -6858,216 +8052,36 @@
+@@ -6857,216 +8055,36 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -11405,9 +11493,25 @@
-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
++
++
++
++
++ # Check whether --enable-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
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11416,14 +11520,8 @@
-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 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,--no-undefined"
- cat >conftest.$ac_ext <<_ACEOF
@@ -11432,14 +11530,7 @@
-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 ()
-{
@@ -11614,8 +11705,8 @@
-
-
+-
-# Check whether --enable-shared or --disable-shared was given.
+# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then
@@ -11625,15 +11716,15 @@
case $enableval in
yes) enable_shared=yes ;;
no) enable_shared=no ;;
-@@ -7086,12 +8100,12 @@
+@@ -7085,12 +8103,12 @@
esac
else
enable_shared=yes
-fi;
+fi
++
-# Check whether --enable-static or --disable-static was given.
-+
+# Check whether --enable-static was given.
if test "${enable_static+set}" = set; then
- enableval="$enable_static"
@@ -11642,7 +11733,7 @@
case $enableval in
yes) enable_static=yes ;;
no) enable_static=no ;;
-@@ -7110,7 +8124,8 @@
+@@ -7109,18 +8127,19 @@
esac
else
enable_static=no
@@ -11652,23 +11743,22 @@
-@@ -7119,11 +8134,11 @@
- if test -z "$kdelibsuff"; then
- kdelibsuff="no"
- fi
+
- # Check whether --enable-libsuffix or --disable-libsuffix was given.
+ # Check whether --enable-libsuffix was given.
if test "${enable_libsuffix+set}" = set; then
- enableval="$enable_libsuffix"
- kdelibsuff=$enableval
++ enableval=$enable_libsuffix; kdelibsuff=$enableval
+ else
+ kdelibsuff="auto"
-fi;
-+ enableval=$enable_libsuffix; kdelibsuff=$enableval
+fi
+
if test "$kdelibsuff" = "auto"; then
-@@ -7144,8 +8159,8 @@
+@@ -7141,8 +8160,8 @@
kdelibsuff=
fi
if test -z "$kdelibsuff"; then
@@ -11679,7 +11769,7 @@
cat >>confdefs.h <<\_ACEOF
#define KDELIBSUFF ""
-@@ -7161,14 +8176,13 @@
+@@ -7158,14 +8177,13 @@
#define KDELIBSUFF "${kdelibsuff}"
_ACEOF
@@ -11698,22 +11788,22 @@
case $enableval in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
-@@ -7187,10 +8201,11 @@
+@@ -7184,10 +8202,11 @@
esac
else
enable_fast_install=yes
-fi;
+fi
++
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7214,7 +8229,7 @@
+@@ -7211,7 +8230,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -11722,7 +11812,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7243,37 +8258,184 @@
+@@ -7240,37 +8259,184 @@
fi
SED=$lt_cv_path_SED
@@ -11798,10 +11888,7 @@
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
+fi
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
++
+else
+ ac_cv_path_GREP=$GREP
+fi
@@ -11812,12 +11899,18 @@
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
-+
+
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+{ echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+- then ac_cv_prog_egrep='grep -E'
+- else ac_cv_prog_egrep='egrep'
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
@@ -11825,11 +11918,8 @@
+if test -z "$EGREP"; then
+set dummy egrep; ac_prog_name=$2
+if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ ac_path_EGREP_found=false
+# Loop through the user's path and test for each of PROGNAME-LIST
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11924,7 +12014,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -7302,11 +8464,11 @@
+@@ -7299,11 +8465,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -11940,7 +12030,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7319,7 +8481,7 @@
+@@ -7316,7 +8482,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -11949,7 +12039,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7339,21 +8501,21 @@
+@@ -7336,21 +8502,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -11978,7 +12068,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7363,29 +8525,38 @@
+@@ -7360,29 +8526,38 @@
;;
esac
fi
@@ -12025,7 +12115,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7393,56 +8564,63 @@
+@@ -7390,56 +8565,63 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -12123,7 +12213,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7469,44 +8647,36 @@
+@@ -7466,44 +8648,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -12178,7 +12268,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7522,7 +8692,7 @@
+@@ -7519,7 +8693,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -12187,7 +12277,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7538,43 +8708,27 @@
+@@ -7535,43 +8709,27 @@
esac
;;
@@ -12244,7 +12334,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
-@@ -7593,32 +8747,22 @@
+@@ -7590,32 +8748,22 @@
;;
openbsd*)
@@ -12280,7 +12370,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7639,17 +8783,20 @@
+@@ -7636,17 +8784,20 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -12304,7 +12394,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7658,14 +8805,17 @@
+@@ -7655,14 +8806,17 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -12325,16 +12415,16 @@
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
-@@ -7692,7 +8842,7 @@
+@@ -7689,7 +8843,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7695 "configure"' > conftest.$ac_ext
-+ echo '#line 8845 "configure"' > conftest.$ac_ext
+- echo '#line 7692 "configure"' > conftest.$ac_ext
++ echo '#line 8846 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7735,14 +8885,13 @@
+@@ -7732,14 +8886,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -12351,7 +12441,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7754,7 +8903,6 @@
+@@ -7751,7 +8904,6 @@
esac
;;
*64-bit*)
@@ -12359,7 +12449,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7779,8 +8927,8 @@
+@@ -7776,8 +8928,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -12370,7 +12460,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7806,24 +8954,36 @@
+@@ -7803,24 +8955,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12415,7 +12505,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7832,9 +8992,10 @@
+@@ -7829,9 +8993,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12424,11 +12514,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -7843,25 +9004,45 @@
+@@ -7840,22 +9005,42 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -12442,17 +12532,6 @@
fi
;;
-
--esac
--
--need_locks="$enable_libtool_lock"
--
--
--
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
--if test "${ac_cv_header_stdc+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
@@ -12474,21 +12553,20 @@
+ ;;
+
+
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+
-+
-+
+ esac
+
+ need_locks="$enable_libtool_lock"
+
+
+
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+if test "${ac_cv_header_stdc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -7882,24 +9063,36 @@
+ if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7879,24 +9064,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12533,7 +12611,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7908,9 +9101,10 @@
+@@ -7905,9 +9102,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12546,7 +12624,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7966,6 +9160,7 @@
+@@ -7963,6 +9161,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -12554,7 +12632,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7985,18 +9180,27 @@
+@@ -7982,18 +9181,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -12588,7 +12666,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8009,12 +9213,14 @@
+@@ -8006,12 +9214,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -12606,7 +12684,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8037,9 +9243,9 @@
+@@ -8034,9 +9244,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12619,7 +12697,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8053,24 +9259,36 @@
+@@ -8050,24 +9260,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12664,7 +12742,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8079,12 +9297,14 @@
+@@ -8076,12 +9298,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12683,7 +12761,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8099,18 +9319,19 @@
+@@ -8096,18 +9320,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12711,7 +12789,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8121,24 +9342,36 @@
+@@ -8118,24 +9343,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12756,7 +12834,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8147,15 +9380,16 @@
+@@ -8144,15 +9381,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12779,7 +12857,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8164,8 +9398,13 @@
+@@ -8161,8 +9399,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12795,7 +12873,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -8189,9 +9428,10 @@
+@@ -8186,9 +9429,10 @@
ac_header_preproc=no
fi
@@ -12808,7 +12886,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8215,25 +9455,19 @@
+@@ -8212,25 +9456,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -12841,7 +12919,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8245,324 +9479,693 @@
+@@ -8242,343 +9480,709 @@
done
@@ -12954,7 +13032,7 @@
-
-
-# Provide some information about the compiler.
--echo "$as_me:8340:" \
+-echo "$as_me:8337:" \
- "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
@@ -13125,25 +13203,24 @@
+ else
+ ac_cpp_err=
+ fi
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_prog_f77_g=no
++else
+ ac_cpp_err=yes
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+-ac_cv_prog_f77_g=no
+ # Passes both tests.
+ac_preproc_ok=:
+break
fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-if test "$ac_test_FFLAGS" = set; then
@@ -13151,7 +13228,9 @@
-elif test $ac_cv_prog_f77_g = yes; then
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
- FFLAGS="-g -O2"
-+
+- else
+- FFLAGS="-g"
+- fi
+rm -f conftest.err conftest.$ac_ext
+
+done
@@ -13166,7 +13245,9 @@
+
+fi
+ CXXCPP=$ac_cv_prog_CXXCPP
-+else
+ else
+- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+- FFLAGS="-O2"
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
@@ -13210,26 +13291,38 @@
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
else
-- FFLAGS="-g"
+- FFLAGS=
+ ac_cpp_err=
fi
- else
-- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-- FFLAGS="-O2"
++else
+ ac_cpp_err=yes
-+fi
+ fi
+if test -z "$ac_cpp_err"; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-+
+
+-G77=`test $ac_compiler_gnu = yes && echo yes`
+-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
+-
+-
+ # Broken: fails on valid input.
+continue
+fi
-+
+
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+rm -f conftest.err conftest.$ac_ext
-+
+
+-# find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
@@ -13256,11 +13349,12 @@
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
-- FFLAGS=
++ else
+ ac_cpp_err=
- fi
-+else
++ fi
+ else
+- i=0
+- testring="ABCD"
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
@@ -13269,20 +13363,38 @@
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-+
+
+- case $build_os in
+- msdosdjgpp*)
+- # On DJGPP, this test can blow up pretty badly due to problems in libc
+- # (any single argument exceeding 2000 bytes causes a buffer overrun
+- # during glob expansion). Even if it were fixed, the result of this
+- # check would be larger than it should be.
+- lt_cv_sys_max_cmd_len=12288; # 12K is about right
+- ;;
+ # Passes both tests.
+ac_preproc_ok=:
+break
- fi
++fi
--G77=`test $ac_compiler_gnu = yes && echo yes`
--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
+- gnu*)
+- # Under GNU Hurd, this test is not required because there is
+- # no limit to the length of command line arguments.
+- # Libtool will interpret -1 as no limit whatsoever
+- lt_cv_sys_max_cmd_len=-1;
+- ;;
+rm -f conftest.err conftest.$ac_ext
+- cygwin* | mingw*)
+- # On Win9x/ME, this test blows up -- it succeeds, but takes
+- # about 5 minutes as the teststring grows exponentially.
+- # Worse, since 9x/ME are not pre-emptively multitasking,
+- # you end up with a "frozen" computer, even though with patience
+- # the test eventually succeeds (with a max line length of 256k).
+- # Instead, let's just punt: use the minimum linelength reported by
+- # all of the supported platforms: 8192 (on NT/2K/XP).
+- lt_cv_sys_max_cmd_len=8192;
+- ;;
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
@@ -13296,19 +13408,37 @@
+ { (exit 1); exit 1; }; }
+fi
+- *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring=$testring$testring
+- done
+- testring=
+- # 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.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+- ;;
+- esac
+ac_ext=cpp
+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
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+fi
+ fi
--# find the maximum length of command line arguments
--echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
--if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+-if test -n $lt_cv_sys_max_cmd_len ; then
+- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
+ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -13321,26 +13451,12 @@
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_F77+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
++ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- i=0
-- testring="ABCD"
+- echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
+-fi
-
-- case $build_os in
-- msdosdjgpp*)
-- # On DJGPP, this test can blow up pretty badly due to problems in libc
-- # (any single argument exceeding 2000 bytes causes a buffer overrun
-- # during glob expansion). Even if it were fixed, the result of this
-- # check would be larger than it should be.
-- lt_cv_sys_max_cmd_len=12288; # 12K is about right
-- ;;
--
-- gnu*)
-- # Under GNU Hurd, this test is not required because there is
-- # no limit to the length of command line arguments.
-- # Libtool will interpret -1 as no limit whatsoever
-- lt_cv_sys_max_cmd_len=-1;
-- ;;
+ if test -n "$F77"; then
+ ac_cv_prog_F77="$F77" # Let the user override the test.
+else
@@ -13359,16 +13475,6 @@
+done
+IFS=$as_save_IFS
-- cygwin* | mingw*)
-- # On Win9x/ME, this test blows up -- it succeeds, but takes
-- # about 5 minutes as the teststring grows exponentially.
-- # Worse, since 9x/ME are not pre-emptively multitasking,
-- # you end up with a "frozen" computer, even though with patience
-- # the test eventually succeeds (with a max line length of 256k).
-- # Instead, let's just punt: use the minimum linelength reported by
-- # all of the supported platforms: 8192 (on NT/2K/XP).
-- lt_cv_sys_max_cmd_len=8192;
-- ;;
+fi
+fi
+F77=$ac_cv_prog_F77
@@ -13380,30 +13486,14 @@
+echo "${ECHO_T}no" >&6; }
+fi
-- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-- = "XX$testring") >/dev/null 2>&1 &&
-- new_result=`expr "X$testring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- testring=$testring$testring
-- done
-- testring=
-- # 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.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-- ;;
-- esac
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+ test -n "$F77" && break
+ done
- fi
++fi
+if test -z "$F77"; then
+ ac_ct_F77=$F77
+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
@@ -13413,8 +13503,8 @@
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -n "$ac_ct_F77"; then
+ ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+else
@@ -13433,26 +13523,32 @@
+done
+IFS=$as_save_IFS
--if test -n $lt_cv_sys_max_cmd_len ; then
-- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
+-
+-# Character class describing NM global symbol codes.
+-symcode='[BCDEGRST]'
+fi
+fi
+ac_ct_F77=$ac_cv_prog_ac_ct_F77
+if test -n "$ac_ct_F77"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+echo "${ECHO_T}$ac_ct_F77" >&6; }
- else
-- echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
++else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
- fi
++fi
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+ test -n "$ac_ct_F77" && break
+done
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ if test "x$ac_ct_F77" = x; then
+ F77=""
+ else
@@ -13470,14 +13566,11 @@
+ fi
+fi
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
--if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
--# These are sane defaults that work on at least a few old systems.
+-# Define system-specific variables.
+-case $host_os in
+# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
@@ -13795,20 +13888,26 @@
+else
+
+# These are sane defaults that work on at least a few old systems.
- # [They come from Ultrix. What could be older than Ultrix?!! ;)]
-
- # Character class describing NM global symbol codes.
-@@ -8571,9 +10174,6 @@
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
--
- # Transform an extracted symbol line into a proper C declaration
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-@@ -8595,14 +10195,30 @@
++# [They come from Ultrix. What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
+ aix*)
+ symcode='[BCDT]'
+ ;;
+@@ -8592,14 +10196,30 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -13841,7 +13940,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8620,14 +10236,17 @@
+@@ -8617,14 +10237,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -13861,7 +13960,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8745,15 +10364,15 @@
+@@ -8742,15 +10365,15 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -13883,7 +13982,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8767,8 +10386,8 @@
+@@ -8764,8 +10387,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -13894,7 +13993,7 @@
objdir=$lt_cv_objdir
-@@ -8789,7 +10408,7 @@
+@@ -8786,7 +10409,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -13903,7 +14002,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8809,7 +10428,7 @@
+@@ -8806,7 +10429,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -13912,7 +14011,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8819,8 +10438,8 @@
+@@ -8816,8 +10439,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -13923,7 +14022,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8833,32 +10452,34 @@
+@@ -8830,32 +10453,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13965,7 +14064,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8871,27 +10492,41 @@
+@@ -8868,27 +10493,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14014,7 +14113,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -8899,8 +10534,8 @@
+@@ -8896,8 +10535,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -14025,7 +14124,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8913,32 +10548,34 @@
+@@ -8910,32 +10549,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14067,7 +14166,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8951,27 +10588,41 @@
+@@ -8948,27 +10589,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14116,7 +14215,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -8979,8 +10630,8 @@
+@@ -8976,8 +10631,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -14127,7 +14226,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8993,32 +10644,34 @@
+@@ -8990,32 +10645,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14169,7 +14268,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9031,27 +10684,41 @@
+@@ -9028,27 +10685,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14218,7 +14317,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -9066,6 +10733,7 @@
+@@ -9063,6 +10734,7 @@
test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
@@ -14226,7 +14325,7 @@
test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
test -z "$LN_S" && LN_S="ln -s"
-@@ -9085,21 +10753,32 @@
+@@ -9082,21 +10754,32 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
@@ -14263,7 +14362,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9119,7 +10798,7 @@
+@@ -9116,7 +10799,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14272,7 +14371,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9151,17 +10830,17 @@
+@@ -9148,17 +10831,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14296,7 +14395,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9181,7 +10860,7 @@
+@@ -9178,7 +10861,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -14305,7 +14404,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9213,11 +10892,11 @@
+@@ -9210,11 +10893,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -14321,7 +14420,7 @@
fi
else
-@@ -9232,21 +10911,21 @@
+@@ -9229,21 +10912,21 @@
enable_dlopen=yes
enable_win32_dll=no
@@ -14350,7 +14449,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -9276,68 +10955,25 @@
+@@ -9273,68 +10956,25 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -14434,7 +14533,7 @@
## CAVEAT EMPTOR:
-@@ -9351,8 +10987,8 @@
+@@ -9348,8 +10988,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -14445,7 +14544,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9366,26 +11002,28 @@
+@@ -9363,26 +11003,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -14453,13 +14552,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9372: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11008: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9369: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11009: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9376: \$? = $ac_status" >&5
-+ echo "$as_me:11012: \$? = $ac_status" >&5
+- echo "$as_me:9373: \$? = $ac_status" >&5
++ echo "$as_me:11013: \$? = $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
@@ -14481,7 +14580,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9399,8 +11037,8 @@
+@@ -9396,8 +11038,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -14492,7 +14591,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9438,6 +11076,11 @@
+@@ -9435,6 +11077,11 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -14504,7 +14603,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -9454,7 +11097,7 @@
+@@ -9451,7 +11098,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14513,7 +14612,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9480,6 +11123,16 @@
+@@ -9477,6 +11124,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -14530,7 +14629,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9491,7 +11144,7 @@
+@@ -9488,7 +11145,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -14539,7 +14638,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9514,13 +11167,20 @@
+@@ -9511,13 +11168,20 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14562,7 +14661,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9535,15 +11195,15 @@
+@@ -9532,15 +11196,15 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -14584,7 +14683,7 @@
;;
sunos4*)
-@@ -9552,7 +11212,7 @@
+@@ -9549,7 +11213,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -14593,7 +14692,7 @@
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9565,6 +11225,17 @@
+@@ -9562,6 +11226,17 @@
fi
;;
@@ -14611,7 +14710,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9576,16 +11247,16 @@
+@@ -9573,16 +11248,16 @@
esac
fi
@@ -14632,7 +14731,7 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9599,26 +11270,28 @@
+@@ -9596,26 +11271,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -14640,13 +14739,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9605: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11276: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9602: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11277: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9609: \$? = $ac_status" >&5
-+ echo "$as_me:11280: \$? = $ac_status" >&5
+- echo "$as_me:9606: \$? = $ac_status" >&5
++ echo "$as_me:11281: \$? = $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
@@ -14668,7 +14767,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9631,7 +11304,7 @@
+@@ -9628,7 +11305,7 @@
fi
fi
@@ -14677,7 +14776,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9641,8 +11314,50 @@
+@@ -9638,8 +11315,50 @@
;;
esac
@@ -14730,7 +14829,7 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9653,60 +11368,58 @@
+@@ -9650,60 +11369,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -14751,13 +14850,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9672: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:11380: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9669: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:11381: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9676: \$? = $ac_status" >&5
-+ echo "$as_me:11384: \$? = $ac_status" >&5
+- echo "$as_me:9673: \$? = $ac_status" >&5
++ echo "$as_me:11385: \$? = $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
@@ -14809,7 +14908,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9716,8 +11429,8 @@
+@@ -9713,8 +11430,8 @@
need_locks=no
fi
@@ -14820,7 +14919,7 @@
runpath_var=
allow_undefined_flag=
-@@ -9755,6 +11468,16 @@
+@@ -9752,6 +11469,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -14837,7 +14936,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9765,6 +11488,10 @@
+@@ -9762,6 +11489,10 @@
with_gnu_ld=no
fi
;;
@@ -14848,7 +14947,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -9775,6 +11502,27 @@
+@@ -9772,6 +11503,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -14876,7 +14975,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9812,7 +11560,7 @@
+@@ -9809,7 +11561,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -14885,7 +14984,7 @@
else
ld_shlibs=no
fi
-@@ -9822,13 +11570,13 @@
+@@ -9819,13 +11571,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'
@@ -14902,7 +15001,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
-@@ -9837,23 +11585,70 @@
+@@ -9834,23 +11586,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -14978,7 +15077,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
cat <<EOF 1>&2
-@@ -9867,13 +11662,40 @@
+@@ -9864,13 +11663,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15021,7 +15120,7 @@
sunos4*)
archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -9883,24 +11705,19 @@
+@@ -9880,24 +11706,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15053,7 +15152,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9912,7 +11729,7 @@
+@@ -9909,7 +11730,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -15062,7 +15161,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
-@@ -9934,9 +11751,21 @@
+@@ -9931,9 +11752,21 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -15086,7 +15185,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9953,7 +11782,7 @@
+@@ -9950,7 +11783,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -15095,7 +15194,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -9972,8 +11801,12 @@
+@@ -9969,8 +11802,12 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
@@ -15108,7 +15207,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9981,22 +11814,23 @@
+@@ -9978,22 +11815,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -15139,7 +15238,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -10012,24 +11846,36 @@
+@@ -10009,24 +11847,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15184,7 +15283,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10043,19 +11889,20 @@
+@@ -10040,19 +11890,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15192,7 +15291,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -15210,7 +15309,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -10074,24 +11921,36 @@
+@@ -10071,24 +11922,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15255,7 +15354,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10105,8 +11964,10 @@
+@@ -10102,8 +11965,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15263,11 +15362,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10115,13 +11976,11 @@
+@@ -10112,13 +11977,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag=' ${wl}-bernotok'
allow_undefined_flag=' ${wl}-berok'
@@ -15284,7 +15383,7 @@
fi
fi
;;
-@@ -10134,7 +11993,7 @@
+@@ -10131,7 +11994,7 @@
ld_shlibs=no
;;
@@ -15293,7 +15392,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -10144,13 +12003,13 @@
+@@ -10141,13 +12004,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -15310,7 +15409,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.
-@@ -10160,52 +12019,52 @@
+@@ -10157,52 +12020,52 @@
;;
darwin* | rhapsody*)
@@ -15403,7 +15502,7 @@
fi
;;
-@@ -10239,8 +12098,8 @@
+@@ -10236,8 +12099,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15414,7 +15513,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10248,7 +12107,7 @@
+@@ -10245,7 +12108,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -15423,7 +15522,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
-@@ -10262,47 +12121,62 @@
+@@ -10259,47 +12122,62 @@
export_dynamic_flag_spec='${wl}-E'
;;
@@ -15510,7 +15609,7 @@
hardcode_direct=yes
export_dynamic_flag_spec='${wl}-E'
-@@ -10316,7 +12190,7 @@
+@@ -10313,7 +12191,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15519,7 +15618,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'
-@@ -10326,7 +12200,7 @@
+@@ -10323,7 +12201,7 @@
link_all_deplibs=yes
;;
@@ -15528,7 +15627,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10349,7 +12223,8 @@
+@@ -10346,7 +12224,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -15538,7 +15637,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10359,7 +12234,7 @@
+@@ -10356,7 +12235,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -15547,7 +15646,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10370,14 +12245,14 @@
+@@ -10367,14 +12246,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -15564,7 +15663,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'
-@@ -10389,13 +12264,13 @@
+@@ -10386,13 +12265,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15580,7 +15679,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10403,21 +12278,15 @@
+@@ -10400,21 +12279,15 @@
hardcode_libdir_separator=:
;;
@@ -15606,7 +15705,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10426,8 +12295,18 @@
+@@ -10423,8 +12296,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15627,7 +15726,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10436,7 +12315,7 @@
+@@ -10433,7 +12316,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.
@@ -15636,7 +15735,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10484,36 +12363,45 @@
+@@ -10481,36 +12364,45 @@
fi
;;
@@ -15703,7 +15802,7 @@
;;
uts4*)
-@@ -10528,15 +12416,10 @@
+@@ -10525,15 +12417,10 @@
esac
fi
@@ -15721,7 +15820,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -10554,8 +12437,8 @@
+@@ -10551,8 +12438,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -15732,7 +15831,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -10569,6 +12452,7 @@
+@@ -10566,6 +12453,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl
@@ -15740,7 +15839,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -10591,20 +12475,20 @@
+@@ -10588,20 +12476,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -15766,7 +15865,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10614,7 +12498,20 @@
+@@ -10611,7 +12499,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15788,7 +15887,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10679,7 +12576,7 @@
+@@ -10676,7 +12577,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15797,7 +15896,7 @@
;;
beos*)
-@@ -10688,7 +12585,7 @@
+@@ -10685,7 +12586,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -15806,7 +15905,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10704,7 +12601,7 @@
+@@ -10701,7 +12602,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -15815,7 +15914,7 @@
need_version=no
need_lib_prefix=no
-@@ -10716,7 +12613,8 @@
+@@ -10713,7 +12614,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -15825,7 +15924,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10746,7 +12644,7 @@
+@@ -10743,7 +12645,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15834,7 +15933,7 @@
;;
esac
;;
-@@ -10769,7 +12667,7 @@
+@@ -10766,7 +12668,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -15843,7 +15942,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"`
-@@ -10792,20 +12690,17 @@
+@@ -10789,20 +12691,17 @@
dynamic_linker=no
;;
@@ -15875,7 +15974,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10823,14 +12718,19 @@
+@@ -10820,14 +12719,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -15897,7 +15996,7 @@
esac
;;
-@@ -10850,9 +12750,9 @@
+@@ -10847,9 +12751,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -15909,7 +16008,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10867,7 +12767,7 @@
+@@ -10864,7 +12768,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -15918,7 +16017,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10878,7 +12778,7 @@
+@@ -10875,7 +12779,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -15927,17 +16026,10 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10890,13 +12790,25 @@
+@@ -10887,6 +12791,18 @@
postinstall_cmds='chmod 555 $lib'
;;
--irix5* | irix6* | nonstopux*)
-- case $host_os in
-- nonstopux*) version_type=nonstopux ;;
-- *)
-- if test "$lt_cv_prog_gnu_ld" = yes; then
-- version_type=linux
-- else
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
@@ -15950,17 +16042,10 @@
+ hardcode_into_libs=yes
+ ;;
+
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
- version_type=irix
- fi ;;
- esac
-@@ -10933,29 +12845,26 @@
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -10930,29 +12846,26 @@
;;
# This must be Linux ELF.
@@ -15997,7 +16082,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,
-@@ -10965,6 +12874,18 @@
+@@ -10962,6 +12875,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16016,7 +16101,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10974,7 +12895,7 @@
+@@ -10971,7 +12896,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -16025,7 +16110,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -11002,8 +12923,13 @@
+@@ -10999,8 +12924,13 @@
openbsd*)
version_type=sunos
@@ -16040,7 +16125,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
-@@ -11023,7 +12949,7 @@
+@@ -11020,7 +12950,7 @@
os2*)
libname_spec='$name'
@@ -16049,7 +16134,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -11041,13 +12967,6 @@
+@@ -11038,13 +12968,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16063,7 +16148,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11073,7 +12992,7 @@
+@@ -11070,7 +12993,7 @@
need_version=yes
;;
@@ -16072,7 +16157,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11106,6 +13025,29 @@
+@@ -11103,6 +13026,29 @@
fi
;;
@@ -16102,7 +16187,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11117,16 +13059,21 @@
+@@ -11114,16 +13060,21 @@
dynamic_linker=no
;;
esac
@@ -16130,7 +16215,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11146,8 +13093,8 @@
+@@ -11143,8 +13094,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -16141,7 +16226,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11160,29 +13107,29 @@
+@@ -11157,29 +13108,29 @@
striplib=
old_striplib=
@@ -16181,7 +16266,7 @@
;;
esac
fi
-@@ -11214,8 +13161,8 @@
+@@ -11211,8 +13162,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -16192,7 +16277,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11228,40 +13175,52 @@
+@@ -11225,40 +13176,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16257,7 +16342,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11270,14 +13229,15 @@
+@@ -11267,14 +13230,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16266,7 +16351,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16277,7 +16362,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11291,8 +13251,8 @@
+@@ -11288,8 +13252,8 @@
;;
*)
@@ -16288,7 +16373,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11319,53 +13279,59 @@
+@@ -11316,53 +13280,59 @@
#undef shl_load
@@ -16367,7 +16452,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11374,18 +13340,19 @@
+@@ -11371,18 +13341,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16376,7 +16461,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -16393,7 +16478,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11398,40 +13365,52 @@
+@@ -11395,40 +13366,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16458,7 +16543,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11440,19 +13419,20 @@
+@@ -11437,19 +13420,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16467,7 +16552,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16485,7 +16570,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11479,53 +13459,59 @@
+@@ -11476,53 +13460,59 @@
#undef dlopen
@@ -16564,7 +16649,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11534,18 +13520,19 @@
+@@ -11531,18 +13521,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16573,7 +16658,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -16590,7 +16675,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11558,40 +13545,52 @@
+@@ -11555,40 +13546,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16655,7 +16740,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11600,19 +13599,20 @@
+@@ -11597,19 +13600,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16664,7 +16749,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16682,7 +16767,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11625,40 +13625,52 @@
+@@ -11622,40 +13626,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16747,7 +16832,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11667,19 +13679,20 @@
+@@ -11664,19 +13680,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16756,7 +16841,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16774,7 +16859,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11692,40 +13705,52 @@
+@@ -11689,40 +13706,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16839,7 +16924,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -11734,14 +13759,15 @@
+@@ -11731,14 +13760,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16848,7 +16933,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16859,7 +16944,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -11776,13 +13802,13 @@
+@@ -11773,13 +13803,13 @@
test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
save_LDFLAGS="$LDFLAGS"
@@ -16876,16 +16961,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11792,7 +13818,7 @@
+@@ -11789,7 +13819,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11795 "configure"
-+#line 13821 "configure"
+-#line 11792 "configure"
++#line 13822 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11849,6 +13875,8 @@
+@@ -11846,6 +13876,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16894,7 +16979,7 @@
exit (status);
}
-@@ -11858,12 +13886,12 @@
+@@ -11855,12 +13887,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16909,7 +16994,7 @@
esac
else :
# compilation failed
-@@ -11874,13 +13902,13 @@
+@@ -11871,13 +13903,13 @@
fi
@@ -16928,16 +17013,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11890,7 +13918,7 @@
+@@ -11887,7 +13919,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11893 "configure"
-+#line 13921 "configure"
+-#line 11890 "configure"
++#line 13922 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11947,6 +13975,8 @@
+@@ -11944,6 +13976,8 @@
else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
/* dlclose (self); */
}
@@ -16946,7 +17031,7 @@
exit (status);
}
-@@ -11956,12 +13986,12 @@
+@@ -11953,12 +13987,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16961,7 +17046,7 @@
esac
else :
# compilation failed
-@@ -11972,8 +14002,8 @@
+@@ -11969,8 +14003,8 @@
fi
@@ -16972,7 +17057,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -11994,19 +14024,19 @@
+@@ -11991,19 +14025,19 @@
fi
@@ -17000,7 +17085,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -12015,58 +14045,21 @@
+@@ -12012,58 +14046,21 @@
fi
;;
@@ -17066,7 +17151,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12081,7 +14074,8 @@
+@@ -12078,7 +14075,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.
@@ -17076,7 +17161,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 \
-@@ -12195,11 +14189,11 @@
+@@ -12192,11 +14190,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -17090,7 +17175,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12229,6 +14223,12 @@
+@@ -12226,6 +14224,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -17103,7 +17188,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12240,6 +14240,9 @@
+@@ -12237,6 +14241,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -17113,7 +17198,7 @@
# A language-specific compiler.
CC=$lt_compiler
-@@ -12259,7 +14262,7 @@
+@@ -12256,7 +14263,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -17122,7 +17207,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12290,7 +14293,7 @@
+@@ -12287,7 +14294,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -17131,7 +17216,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12305,7 +14308,7 @@
+@@ -12302,7 +14309,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -17140,7 +17225,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12532,7 +14535,10 @@
+@@ -12529,7 +14536,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.
@@ -17152,7 +17237,7 @@
fi
-@@ -12545,11 +14551,11 @@
+@@ -12542,11 +14552,11 @@
CC="$lt_save_CC"
@@ -17168,7 +17253,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -12567,6 +14573,9 @@
+@@ -12564,6 +14574,9 @@
echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
fi
fi
@@ -17178,7 +17263,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -12597,8 +14606,10 @@
+@@ -12594,8 +14607,10 @@
case $tagname in
CXX)
@@ -17191,7 +17276,7 @@
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'
-@@ -12617,6 +14628,7 @@
+@@ -12614,6 +14629,7 @@
hardcode_libdir_flag_spec_ld_CXX=
hardcode_libdir_separator_CXX=
hardcode_minus_L_CXX=no
@@ -17199,7 +17284,7 @@
hardcode_automatic_CXX=no
module_cmds_CXX=
module_expsym_cmds_CXX=
-@@ -12634,7 +14646,7 @@
+@@ -12631,7 +14647,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -17208,7 +17293,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12644,17 +14656,34 @@
+@@ -12641,17 +14657,34 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -17244,7 +17329,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12665,18 +14694,27 @@
+@@ -12662,18 +14695,27 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -17275,7 +17360,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12690,18 +14728,18 @@
+@@ -12687,18 +14729,18 @@
# Set up default GNU C++ configuration
@@ -17300,7 +17385,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -12730,11 +14768,11 @@
+@@ -12727,11 +14769,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17316,7 +17401,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12747,7 +14785,7 @@
+@@ -12744,7 +14786,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -17325,7 +17410,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -12767,21 +14805,21 @@
+@@ -12764,21 +14806,21 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17354,7 +17439,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12791,8 +14829,8 @@
+@@ -12788,8 +14830,8 @@
;;
esac
fi
@@ -17365,7 +17450,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -12800,8 +14838,8 @@
+@@ -12797,8 +14839,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
@@ -17376,7 +17461,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12827,7 +14865,7 @@
+@@ -12824,7 +14866,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.
@@ -17385,7 +17470,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12842,8 +14880,8 @@
+@@ -12839,8 +14881,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17396,7 +17481,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -12858,8 +14896,23 @@
+@@ -12855,8 +14897,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -17422,7 +17507,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12876,7 +14929,7 @@
+@@ -12873,7 +14930,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -17431,7 +17516,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -12895,8 +14948,12 @@
+@@ -12892,8 +14949,12 @@
hardcode_libdir_flag_spec_CXX='-L$libdir'
hardcode_libdir_separator_CXX=
fi
@@ -17444,7 +17529,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12905,15 +14962,16 @@
+@@ -12902,15 +14963,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -17465,7 +17550,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.
-@@ -12935,24 +14993,36 @@
+@@ -12932,24 +14994,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17510,7 +17595,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -12966,20 +15036,21 @@
+@@ -12963,20 +15037,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17518,7 +17603,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -17536,7 +17621,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12998,24 +15069,36 @@
+@@ -12995,24 +15070,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17581,7 +17666,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13029,8 +15112,10 @@
+@@ -13026,8 +15113,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17589,11 +17674,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13039,16 +15124,26 @@
+@@ -13036,16 +15125,26 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_CXX=' ${wl}-bernotok'
allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17625,7 +17710,7 @@
chorus*)
case $cc_basename in
*)
-@@ -13062,12 +15157,12 @@
+@@ -13059,12 +15158,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'
@@ -17640,7 +17725,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
-@@ -13076,70 +15171,81 @@
+@@ -13073,70 +15172,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -17774,7 +17859,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13150,14 +15256,14 @@
+@@ -13147,14 +15257,14 @@
;;
esac
;;
@@ -17791,7 +17876,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13174,12 +15280,12 @@
+@@ -13171,12 +15281,12 @@
# location of the library.
case $cc_basename in
@@ -17807,7 +17892,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13188,11 +15294,11 @@
+@@ -13185,11 +15295,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.
@@ -17821,7 +17906,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13202,33 +15308,22 @@
+@@ -13199,33 +15309,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -17862,7 +17947,7 @@
;;
*)
hardcode_direct_CXX=yes
-@@ -13239,17 +15334,20 @@
+@@ -13236,17 +15335,20 @@
esac
case $cc_basename in
@@ -17889,7 +17974,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13265,12 +15363,15 @@
+@@ -13262,12 +15364,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -17909,7 +17994,7 @@
;;
esac
fi
-@@ -13281,11 +15382,25 @@
+@@ -13278,11 +15383,25 @@
;;
esac
;;
@@ -17937,7 +18022,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13296,9 +15411,9 @@
+@@ -13293,9 +15412,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -17949,7 +18034,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13307,16 +15422,16 @@
+@@ -13304,16 +15423,16 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17970,7 +18055,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13334,20 +15449,44 @@
+@@ -13331,20 +15450,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -18003,9 +18088,6 @@
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
-- # Compaq C++
-- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ pgCC*)
+ # Portland Group C++ compiler
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
@@ -18016,13 +18098,15 @@
+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
-+ # Compaq C++
+ # Compaq C++
+- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13375,7 +15514,7 @@
+@@ -13372,7 +15515,7 @@
;;
mvs*)
case $cc_basename in
@@ -18031,7 +18115,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13385,7 +15524,7 @@
+@@ -13382,7 +15525,7 @@
;;
esac
;;
@@ -18040,7 +18124,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=
-@@ -13396,15 +15535,31 @@
+@@ -13393,15 +15536,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -18074,7 +18158,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13414,14 +15569,14 @@
+@@ -13411,14 +15570,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -18092,7 +18176,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13439,7 +15594,7 @@
+@@ -13436,7 +15595,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18101,7 +18185,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13458,13 +15613,13 @@
+@@ -13455,13 +15614,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -18117,7 +18201,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13473,17 +15628,17 @@
+@@ -13470,17 +15629,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -18139,7 +18223,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13502,7 +15657,7 @@
+@@ -13499,7 +15658,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18148,7 +18232,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13523,27 +15678,14 @@
+@@ -13520,27 +15679,14 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -18178,7 +18262,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13556,36 +15698,33 @@
+@@ -13553,36 +15699,33 @@
;;
solaris*)
case $cc_basename in
@@ -18227,7 +18311,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13593,9 +15732,9 @@
+@@ -13590,9 +15733,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -18239,7 +18323,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13605,9 +15744,9 @@
+@@ -13602,9 +15745,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
@@ -18251,7 +18335,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13616,9 +15755,9 @@
+@@ -13613,9 +15756,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -18263,7 +18347,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13631,12 +15770,63 @@
+@@ -13628,12 +15771,63 @@
;;
esac
;;
@@ -18329,7 +18413,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13656,8 +15846,8 @@
+@@ -13653,8 +15847,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -18340,7 +18424,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -13693,7 +15883,7 @@
+@@ -13690,7 +15884,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -18349,7 +18433,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13733,7 +15923,7 @@
+@@ -13730,7 +15924,7 @@
fi
;;
@@ -18358,7 +18442,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13769,6 +15959,29 @@
+@@ -13766,6 +15960,29 @@
$rm -f confest.$objext
@@ -18388,7 +18472,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13777,8 +15990,8 @@
+@@ -13774,8 +15991,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -18399,7 +18483,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -13816,6 +16029,10 @@
+@@ -13813,6 +16030,10 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -18410,7 +18494,7 @@
sysv4*MP*)
if test -d /usr/nec; then
lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13824,7 +16041,7 @@
+@@ -13821,7 +16042,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -18419,7 +18503,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13849,18 +16066,28 @@
+@@ -13846,18 +16067,28 @@
;;
chorus*)
case $cc_basename in
@@ -18451,7 +18535,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13868,22 +16095,22 @@
+@@ -13865,22 +16096,22 @@
;;
esac
;;
@@ -18480,7 +18564,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13896,9 +16123,13 @@
+@@ -13893,9 +16124,13 @@
;;
esac
;;
@@ -18495,7 +18579,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13907,20 +16138,26 @@
+@@ -13904,20 +16139,26 @@
;;
esac
;;
@@ -18526,7 +18610,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13937,25 +16174,25 @@
+@@ -13934,25 +16175,25 @@
;;
mvs*)
case $cc_basename in
@@ -18557,7 +18641,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13969,24 +16206,15 @@
+@@ -13966,24 +16207,15 @@
;;
psos*)
;;
@@ -18584,7 +18668,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13996,12 +16224,12 @@
+@@ -13993,12 +16225,12 @@
;;
sunos4*)
case $cc_basename in
@@ -18599,7 +18683,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -14011,7 +16239,7 @@
+@@ -14008,7 +16240,7 @@
;;
tandem*)
case $cc_basename in
@@ -18608,7 +18692,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -14019,7 +16247,14 @@
+@@ -14016,7 +16248,14 @@
;;
esac
;;
@@ -18624,7 +18708,7 @@
;;
vxworks*)
;;
-@@ -14029,16 +16264,16 @@
+@@ -14026,16 +16265,16 @@
esac
fi
@@ -18645,7 +18729,7 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14052,26 +16287,28 @@
+@@ -14049,26 +16288,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -18653,13 +18737,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14058: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16293: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14055: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16294: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14062: \$? = $ac_status" >&5
-+ echo "$as_me:16297: \$? = $ac_status" >&5
+- echo "$as_me:14059: \$? = $ac_status" >&5
++ echo "$as_me:16298: \$? = $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
@@ -18681,7 +18765,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14084,7 +16321,7 @@
+@@ -14081,7 +16322,7 @@
fi
fi
@@ -18690,7 +18774,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -14094,8 +16331,50 @@
+@@ -14091,8 +16332,50 @@
;;
esac
@@ -18743,7 +18827,7 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14106,60 +16385,58 @@
+@@ -14103,60 +16386,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18764,13 +18848,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14125: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16397: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14122: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16398: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14129: \$? = $ac_status" >&5
-+ echo "$as_me:16401: \$? = $ac_status" >&5
+- echo "$as_me:14126: \$? = $ac_status" >&5
++ echo "$as_me:16402: \$? = $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
@@ -18822,7 +18906,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14169,8 +16446,8 @@
+@@ -14166,8 +16447,8 @@
need_locks=no
fi
@@ -18833,7 +18917,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -14187,22 +16464,20 @@
+@@ -14184,22 +16465,20 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -18862,7 +18946,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -14220,8 +16495,8 @@
+@@ -14217,8 +16496,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -18873,7 +18957,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14235,6 +16510,7 @@
+@@ -14232,6 +16511,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_CXX
@@ -18881,7 +18965,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -14257,20 +16533,20 @@
+@@ -14254,20 +16534,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18907,7 +18991,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14280,7 +16556,20 @@
+@@ -14277,7 +16557,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18929,7 +19013,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14345,7 +16634,7 @@
+@@ -14342,7 +16635,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18938,7 +19022,7 @@
;;
beos*)
-@@ -14354,7 +16643,7 @@
+@@ -14351,7 +16644,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -18947,7 +19031,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14370,7 +16659,7 @@
+@@ -14367,7 +16660,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -18956,7 +19040,7 @@
need_version=no
need_lib_prefix=no
-@@ -14382,7 +16671,8 @@
+@@ -14379,7 +16672,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -18966,7 +19050,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14412,7 +16702,7 @@
+@@ -14409,7 +16703,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18975,7 +19059,7 @@
;;
esac
;;
-@@ -14435,7 +16725,7 @@
+@@ -14432,7 +16726,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -18984,7 +19068,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"`
-@@ -14458,20 +16748,17 @@
+@@ -14455,20 +16749,17 @@
dynamic_linker=no
;;
@@ -19016,7 +19100,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14489,14 +16776,19 @@
+@@ -14486,14 +16777,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -19038,7 +19122,7 @@
esac
;;
-@@ -14516,9 +16808,9 @@
+@@ -14513,9 +16809,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -19050,7 +19134,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14533,7 +16825,7 @@
+@@ -14530,7 +16826,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -19059,7 +19143,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14544,7 +16836,7 @@
+@@ -14541,7 +16837,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -19068,7 +19152,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14556,6 +16848,18 @@
+@@ -14553,6 +16849,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19087,7 +19171,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -14599,29 +16903,26 @@
+@@ -14596,29 +16904,26 @@
;;
# This must be Linux ELF.
@@ -19124,7 +19208,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,
-@@ -14631,6 +16932,18 @@
+@@ -14628,6 +16933,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19143,7 +19227,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14640,7 +16953,7 @@
+@@ -14637,7 +16954,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -19152,7 +19236,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14668,8 +16981,13 @@
+@@ -14665,8 +16982,13 @@
openbsd*)
version_type=sunos
@@ -19167,7 +19251,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
-@@ -14689,7 +17007,7 @@
+@@ -14686,7 +17008,7 @@
os2*)
libname_spec='$name'
@@ -19176,7 +19260,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14707,13 +17025,6 @@
+@@ -14704,13 +17026,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19190,7 +19274,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14739,7 +17050,7 @@
+@@ -14736,7 +17051,7 @@
need_version=yes
;;
@@ -19199,7 +19283,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14772,6 +17083,29 @@
+@@ -14769,6 +17084,29 @@
fi
;;
@@ -19229,7 +19313,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14783,16 +17117,21 @@
+@@ -14780,16 +17118,21 @@
dynamic_linker=no
;;
esac
@@ -19257,7 +19341,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14812,8 +17151,8 @@
+@@ -14809,8 +17152,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -19268,7 +19352,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -14824,1242 +17163,420 @@
+@@ -14821,1242 +17164,420 @@
enable_fast_install=needless
fi
@@ -20070,7 +20154,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15461 "configure"
+-#line 15458 "configure"
-#include "confdefs.h"
+# Do we need a version for libraries?
+need_version=$need_version
@@ -20190,7 +20274,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 15559 "configure"
+-#line 15556 "configure"
-#include "confdefs.h"
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
@@ -20823,7 +20907,7 @@
CC=$lt_save_CC
LDCXX=$LD
-@@ -16123,29 +17640,55 @@
+@@ -16120,29 +17641,55 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -20863,19 +20947,19 @@
+ esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
+
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
+echo "${ECHO_T}$can_build_shared" >&6; }
-
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++
+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
test "$can_build_shared" = "no" && enable_shared=no
@@ -20887,7 +20971,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -16153,21 +17696,21 @@
+@@ -16150,21 +17697,21 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -20919,7 +21003,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16176,8 +17719,8 @@
+@@ -16173,8 +17720,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -20930,7 +21014,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16215,6 +17758,11 @@
+@@ -16212,6 +17759,11 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -20942,7 +21026,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -16231,7 +17779,7 @@
+@@ -16228,7 +17780,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20951,7 +21035,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16257,6 +17805,16 @@
+@@ -16254,6 +17806,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -20968,7 +21052,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16268,7 +17826,7 @@
+@@ -16265,7 +17827,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -20977,7 +21061,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16291,13 +17849,20 @@
+@@ -16288,13 +17850,20 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -21000,7 +21084,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16312,15 +17877,15 @@
+@@ -16309,15 +17878,15 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -21022,7 +21106,7 @@
;;
sunos4*)
-@@ -16329,7 +17894,7 @@
+@@ -16326,7 +17895,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -21031,7 +21115,7 @@
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16342,6 +17907,17 @@
+@@ -16339,6 +17908,17 @@
fi
;;
@@ -21049,7 +21133,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16353,16 +17929,16 @@
+@@ -16350,16 +17930,16 @@
esac
fi
@@ -21070,7 +21154,7 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16376,26 +17952,28 @@
+@@ -16373,26 +17953,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -21078,13 +21162,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16382: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17958: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16379: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17959: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16386: \$? = $ac_status" >&5
-+ echo "$as_me:17962: \$? = $ac_status" >&5
+- echo "$as_me:16383: \$? = $ac_status" >&5
++ echo "$as_me:17963: \$? = $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
@@ -21106,7 +21190,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16408,7 +17986,7 @@
+@@ -16405,7 +17987,7 @@
fi
fi
@@ -21115,7 +21199,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16418,24 +17996,59 @@
+@@ -16415,72 +17997,112 @@
;;
esac
@@ -21144,6 +21228,7 @@
- # to fail, enabling locking or at least warning the user not to do parallel
- # builds.
- chmod -w .
+-
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -21188,10 +21273,10 @@
+ cd conftest
+ mkdir out
+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
++
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -16443,47 +18056,52 @@
+ # (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
# with a dollar sign (not a hyphen), so the echo should work correctly.
lt_compile=`echo "$ac_compile" | $SED \
@@ -21199,13 +21284,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16449: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18062: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16446: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18063: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16453: \$? = $ac_status" >&5
-+ echo "$as_me:18066: \$? = $ac_status" >&5
+- echo "$as_me:16450: \$? = $ac_status" >&5
++ echo "$as_me:18067: \$? = $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
@@ -21257,7 +21342,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16493,8 +18111,8 @@
+@@ -16490,8 +18112,8 @@
need_locks=no
fi
@@ -21268,7 +21353,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16532,6 +18150,16 @@
+@@ -16529,6 +18151,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -21285,7 +21370,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16542,6 +18170,10 @@
+@@ -16539,6 +18171,10 @@
with_gnu_ld=no
fi
;;
@@ -21296,7 +21381,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -16552,6 +18184,27 @@
+@@ -16549,6 +18185,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -21324,7 +21409,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16589,7 +18242,7 @@
+@@ -16586,7 +18243,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -21333,7 +21418,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16599,13 +18252,13 @@
+@@ -16596,13 +18253,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'
@@ -21350,7 +21435,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
-@@ -16614,23 +18267,70 @@
+@@ -16611,23 +18268,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -21427,7 +21512,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_F77=no
cat <<EOF 1>&2
-@@ -16644,13 +18344,40 @@
+@@ -16641,13 +18345,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21470,7 +21555,7 @@
sunos4*)
archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -16660,24 +18387,19 @@
+@@ -16657,24 +18388,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21502,7 +21587,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16689,7 +18411,7 @@
+@@ -16686,7 +18412,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -21511,7 +21596,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_F77=unsupported
-@@ -16711,9 +18433,21 @@
+@@ -16708,9 +18434,21 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -21535,7 +21620,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16730,7 +18464,7 @@
+@@ -16727,7 +18465,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -21544,7 +21629,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -16749,8 +18483,12 @@
+@@ -16746,8 +18484,12 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_libdir_separator_F77=
fi
@@ -21557,7 +21642,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16758,45 +18496,58 @@
+@@ -16755,45 +18497,58 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -21631,7 +21716,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16810,19 +18561,20 @@
+@@ -16807,19 +18562,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21639,7 +21724,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -21657,7 +21742,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16831,24 +18583,36 @@
+@@ -16828,24 +18584,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21702,7 +21787,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16862,8 +18626,10 @@
+@@ -16859,8 +18627,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21710,11 +21795,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16872,13 +18638,11 @@
+@@ -16869,13 +18639,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_F77=' ${wl}-bernotok'
allow_undefined_flag_F77=' ${wl}-berok'
@@ -21731,7 +21816,7 @@
fi
fi
;;
-@@ -16891,7 +18655,7 @@
+@@ -16888,7 +18656,7 @@
ld_shlibs_F77=no
;;
@@ -21740,7 +21825,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16901,68 +18665,68 @@
+@@ -16898,68 +18666,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -21853,7 +21938,7 @@
fi
;;
-@@ -16996,8 +18760,8 @@
+@@ -16993,8 +18761,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21864,7 +21949,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -17005,7 +18769,7 @@
+@@ -17002,7 +18770,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -21873,7 +21958,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
-@@ -17019,47 +18783,62 @@
+@@ -17016,47 +18784,62 @@
export_dynamic_flag_spec_F77='${wl}-E'
;;
@@ -21960,7 +22045,7 @@
hardcode_direct_F77=yes
export_dynamic_flag_spec_F77='${wl}-E'
-@@ -17073,7 +18852,7 @@
+@@ -17070,7 +18853,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -21969,7 +22054,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'
-@@ -17083,7 +18862,7 @@
+@@ -17080,7 +18863,7 @@
link_all_deplibs_F77=yes
;;
@@ -21978,7 +22063,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
-@@ -17106,7 +18885,8 @@
+@@ -17103,7 +18886,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -21988,7 +22073,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -17116,7 +18896,7 @@
+@@ -17113,7 +18897,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -21997,7 +22082,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -17127,14 +18907,14 @@
+@@ -17124,14 +18908,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -22014,7 +22099,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'
-@@ -17146,13 +18926,13 @@
+@@ -17143,13 +18927,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -22030,7 +22115,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17160,21 +18940,15 @@
+@@ -17157,21 +18941,15 @@
hardcode_libdir_separator_F77=:
;;
@@ -22056,7 +22141,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17183,8 +18957,18 @@
+@@ -17180,8 +18958,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -22077,7 +22162,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17193,7 +18977,7 @@
+@@ -17190,7 +18978,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.
@@ -22086,7 +22171,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17241,36 +19025,45 @@
+@@ -17238,36 +19026,45 @@
fi
;;
@@ -22153,7 +22238,7 @@
;;
uts4*)
-@@ -17285,15 +19078,10 @@
+@@ -17282,15 +19079,10 @@
esac
fi
@@ -22171,7 +22256,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -17311,8 +19099,8 @@
+@@ -17308,8 +19100,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -22182,7 +22267,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17326,6 +19114,7 @@
+@@ -17323,6 +19115,7 @@
libobjs=conftest.$ac_objext
deplibs=
wl=$lt_prog_compiler_wl_F77
@@ -22190,7 +22275,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -17348,20 +19137,20 @@
+@@ -17345,20 +19138,20 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -22216,7 +22301,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17371,7 +19160,20 @@
+@@ -17368,7 +19161,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -22238,7 +22323,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17436,7 +19238,7 @@
+@@ -17433,7 +19239,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -22247,7 +22332,7 @@
;;
beos*)
-@@ -17445,7 +19247,7 @@
+@@ -17442,7 +19248,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -22256,7 +22341,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17461,7 +19263,7 @@
+@@ -17458,7 +19264,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -22265,7 +22350,7 @@
need_version=no
need_lib_prefix=no
-@@ -17473,7 +19275,8 @@
+@@ -17470,7 +19276,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -22275,7 +22360,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17503,7 +19306,7 @@
+@@ -17500,7 +19307,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -22284,7 +22369,7 @@
;;
esac
;;
-@@ -17526,7 +19329,7 @@
+@@ -17523,7 +19330,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -22293,7 +22378,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"`
-@@ -17549,20 +19352,17 @@
+@@ -17546,20 +19353,17 @@
dynamic_linker=no
;;
@@ -22325,7 +22410,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17580,14 +19380,19 @@
+@@ -17577,14 +19381,19 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -22347,7 +22432,7 @@
esac
;;
-@@ -17607,9 +19412,9 @@
+@@ -17604,9 +19413,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -22359,7 +22444,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17624,7 +19429,7 @@
+@@ -17621,7 +19430,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -22368,7 +22453,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17635,7 +19440,7 @@
+@@ -17632,7 +19441,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -22377,7 +22462,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17647,6 +19452,18 @@
+@@ -17644,6 +19453,18 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -22396,7 +22481,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -17690,29 +19507,26 @@
+@@ -17687,29 +19508,26 @@
;;
# This must be Linux ELF.
@@ -22433,7 +22518,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,
-@@ -17722,6 +19536,18 @@
+@@ -17719,6 +19537,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22452,7 +22537,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17731,7 +19557,7 @@
+@@ -17728,7 +19558,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -22461,7 +22546,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17759,8 +19585,13 @@
+@@ -17756,8 +19586,13 @@
openbsd*)
version_type=sunos
@@ -22476,7 +22561,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
-@@ -17780,7 +19611,7 @@
+@@ -17777,7 +19612,7 @@
os2*)
libname_spec='$name'
@@ -22485,7 +22570,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17798,13 +19629,6 @@
+@@ -17795,13 +19630,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -22499,7 +22584,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17830,7 +19654,7 @@
+@@ -17827,7 +19655,7 @@
need_version=yes
;;
@@ -22508,10 +22593,13 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17863,6 +19687,29 @@
+@@ -17860,9 +19688,32 @@
fi
;;
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
@@ -22535,10 +22623,13 @@
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
- uts4*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17874,16 +19721,21 @@
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+@@ -17871,16 +19722,21 @@
dynamic_linker=no
;;
esac
@@ -22566,7 +22657,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17903,8 +19755,8 @@
+@@ -17900,8 +19756,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -22577,7 +22668,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -17915,36 +19767,6 @@
+@@ -17912,36 +19768,6 @@
enable_fast_install=needless
fi
@@ -22614,7 +22705,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17959,7 +19781,8 @@
+@@ -17956,7 +19782,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.
@@ -22624,7 +22715,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 \
-@@ -18059,6 +19882,12 @@
+@@ -18056,6 +19883,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -22637,7 +22728,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -18070,6 +19899,9 @@
+@@ -18067,6 +19900,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -22647,7 +22738,7 @@
# A language-specific compiler.
CC=$lt_compiler_F77
-@@ -18089,7 +19921,7 @@
+@@ -18086,7 +19922,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -22656,7 +22747,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -18120,7 +19952,7 @@
+@@ -18117,7 +19953,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -22665,7 +22756,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18135,7 +19967,7 @@
+@@ -18132,7 +19968,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -22674,7 +22765,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18337,7 +20169,10 @@
+@@ -18334,7 +20170,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.
@@ -22686,7 +22777,7 @@
fi
-@@ -18358,7 +20193,6 @@
+@@ -18355,7 +20194,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -22694,7 +22785,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -18370,26 +20204,55 @@
+@@ -18367,26 +20205,55 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -22751,7 +22842,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -18401,8 +20264,8 @@
+@@ -18398,8 +20265,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -22762,7 +22853,7 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18416,26 +20279,28 @@
+@@ -18413,26 +20280,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -22770,13 +22861,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18422: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20285: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18419: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20286: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18426: \$? = $ac_status" >&5
-+ echo "$as_me:20289: \$? = $ac_status" >&5
+- echo "$as_me:18423: \$? = $ac_status" >&5
++ echo "$as_me:20290: \$? = $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
@@ -22798,7 +22889,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18449,8 +20314,8 @@
+@@ -18446,8 +20315,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -22809,7 +22900,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18488,6 +20353,11 @@
+@@ -18485,6 +20354,11 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -22821,7 +22912,7 @@
msdosdjgpp*)
# Just because we use GCC doesn't mean we suddenly get shared libraries
# on systems that don't support them.
-@@ -18504,7 +20374,7 @@
+@@ -18501,7 +20375,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22830,7 +22921,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18530,6 +20400,16 @@
+@@ -18527,6 +20401,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -22847,7 +22938,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18541,7 +20421,7 @@
+@@ -18538,7 +20422,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -22856,7 +22947,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18564,13 +20444,20 @@
+@@ -18561,13 +20445,20 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22879,7 +22970,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18585,15 +20472,15 @@
+@@ -18582,15 +20473,15 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -22901,7 +22992,7 @@
;;
sunos4*)
-@@ -18602,7 +20489,7 @@
+@@ -18599,7 +20490,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22910,7 +23001,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18615,6 +20502,17 @@
+@@ -18612,6 +20503,17 @@
fi
;;
@@ -22928,7 +23019,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18626,16 +20524,16 @@
+@@ -18623,16 +20525,16 @@
esac
fi
@@ -22949,7 +23040,7 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18649,26 +20547,28 @@
+@@ -18646,26 +20548,28 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -22957,13 +23048,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18655: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20553: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18652: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20554: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18659: \$? = $ac_status" >&5
-+ echo "$as_me:20557: \$? = $ac_status" >&5
+- echo "$as_me:18656: \$? = $ac_status" >&5
++ echo "$as_me:20558: \$? = $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
@@ -22985,7 +23076,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -18681,7 +20581,7 @@
+@@ -18678,7 +20582,7 @@
fi
fi
@@ -22994,7 +23085,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18691,8 +20591,50 @@
+@@ -18688,8 +20592,50 @@
;;
esac
@@ -23047,7 +23138,7 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18703,60 +20645,58 @@
+@@ -18700,60 +20646,58 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -23068,13 +23159,13 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18722: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:20657: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18719: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:20658: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18726: \$? = $ac_status" >&5
-+ echo "$as_me:20661: \$? = $ac_status" >&5
+- echo "$as_me:18723: \$? = $ac_status" >&5
++ echo "$as_me:20662: \$? = $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
@@ -23126,7 +23217,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18766,8 +20706,8 @@
+@@ -18763,8 +20707,8 @@
need_locks=no
fi
@@ -23137,7 +23228,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -18805,6 +20745,16 @@
+@@ -18802,6 +20746,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -23154,7 +23245,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18815,6 +20765,10 @@
+@@ -18812,6 +20766,10 @@
with_gnu_ld=no
fi
;;
@@ -23165,7 +23256,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -18825,6 +20779,27 @@
+@@ -18822,6 +20780,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -23193,7 +23284,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18862,7 +20837,7 @@
+@@ -18859,7 +20838,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -23202,7 +23293,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18872,13 +20847,13 @@
+@@ -18869,13 +20848,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'
@@ -23219,7 +23310,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
-@@ -18887,23 +20862,70 @@
+@@ -18884,23 +20863,70 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -23296,7 +23387,7 @@
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs_GCJ=no
cat <<EOF 1>&2
-@@ -18917,13 +20939,40 @@
+@@ -18914,13 +20940,40 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23339,7 +23430,7 @@
sunos4*)
archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
wlarc=
-@@ -18933,24 +20982,19 @@
+@@ -18930,24 +20983,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -23371,7 +23462,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18962,7 +21006,7 @@
+@@ -18959,7 +21007,7 @@
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -23380,7 +23471,7 @@
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct_GCJ=unsupported
-@@ -18984,9 +21028,21 @@
+@@ -18981,9 +21029,21 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -23404,7 +23495,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -19003,7 +21059,7 @@
+@@ -19000,7 +21060,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -23413,7 +23504,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -19022,8 +21078,12 @@
+@@ -19019,8 +21079,12 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_libdir_separator_GCJ=
fi
@@ -23426,7 +23517,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -19031,22 +21091,23 @@
+@@ -19028,22 +21092,23 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -23457,7 +23548,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19062,24 +21123,36 @@
+@@ -19059,24 +21124,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23502,7 +23593,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19093,19 +21166,20 @@
+@@ -19090,19 +21167,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23510,7 +23601,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -23528,7 +23619,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -19124,24 +21198,36 @@
+@@ -19121,24 +21199,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23573,7 +23664,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19155,8 +21241,10 @@
+@@ -19152,8 +21242,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23581,11 +23672,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19165,13 +21253,11 @@
+@@ -19162,13 +21254,11 @@
# -berok will link without error, but may produce a broken library.
no_undefined_flag_GCJ=' ${wl}-bernotok'
allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23602,7 +23693,7 @@
fi
fi
;;
-@@ -19184,7 +21270,7 @@
+@@ -19181,7 +21271,7 @@
ld_shlibs_GCJ=no
;;
@@ -23611,7 +23702,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19194,68 +21280,68 @@
+@@ -19191,68 +21281,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -23724,7 +23815,7 @@
fi
;;
-@@ -19289,8 +21375,8 @@
+@@ -19286,8 +21376,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23735,7 +23826,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19298,7 +21384,7 @@
+@@ -19295,7 +21385,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -23744,7 +23835,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
-@@ -19312,47 +21398,62 @@
+@@ -19309,47 +21399,62 @@
export_dynamic_flag_spec_GCJ='${wl}-E'
;;
@@ -23831,7 +23922,7 @@
hardcode_direct_GCJ=yes
export_dynamic_flag_spec_GCJ='${wl}-E'
-@@ -19366,7 +21467,7 @@
+@@ -19363,7 +21468,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -23840,7 +23931,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'
-@@ -19376,7 +21477,7 @@
+@@ -19373,7 +21478,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -23849,7 +23940,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
-@@ -19399,7 +21500,8 @@
+@@ -19396,7 +21501,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -23859,7 +23950,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19409,7 +21511,7 @@
+@@ -19406,7 +21512,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -23868,7 +23959,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19420,14 +21522,14 @@
+@@ -19417,14 +21523,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -23885,7 +23976,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'
-@@ -19439,13 +21541,13 @@
+@@ -19436,13 +21542,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23901,7 +23992,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19453,21 +21555,15 @@
+@@ -19450,21 +21556,15 @@
hardcode_libdir_separator_GCJ=:
;;
@@ -23927,7 +24018,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19476,8 +21572,18 @@
+@@ -19473,8 +21573,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23948,7 +24039,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19486,7 +21592,7 @@
+@@ -19483,7 +21593,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.
@@ -23957,7 +24048,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19534,1513 +21640,746 @@
+@@ -19531,36 +21641,45 @@
fi
;;
@@ -24024,29 +24115,24 @@
;;
uts4*)
- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_GCJ='-L$libdir'
-- hardcode_shlibpath_var_GCJ=no
-- ;;
--
-- *)
-- ld_shlibs_GCJ=no
-- ;;
-- esac
-- fi
--
+@@ -19575,1469 +21694,693 @@
+ esac
+ fi
+
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
--test "$ld_shlibs_GCJ" = no && can_build_shared=no
--
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+ test "$ld_shlibs_GCJ" = no && can_build_shared=no
+
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
--#
--# Do we need to explicitly link libc?
--#
+ #
+ # Do we need to explicitly link libc?
+ #
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
- # Assume -lc should be added
@@ -25131,10 +25217,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+ hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+ hardcode_shlibpath_var_GCJ=no
-+ ;;
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -25176,12 +25259,7 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ *)
-+ ld_shlibs_GCJ=no
-+ ;;
-+ esac
-+ fi
-
+-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
@@ -25206,10 +25284,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-+test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
+-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
@@ -25238,9 +25313,6 @@
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+#
-+# Do we need to explicitly link libc?
-+#
+case "x$archive_cmds_need_lc_GCJ" in
+x|xyes)
+ # Assume -lc should be added
@@ -25490,18 +25562,16 @@
+ ;;
+ esac
+ ;;
-
++
+ *)
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
- esac
++ ;;
++ esac
+ dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
-
-- if test "x$lt_cv_dlopen" != xno; then
-- enable_dlopen=yes
++
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
@@ -25515,17 +25585,12 @@
+ # 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"`
- else
-- enable_dlopen=no
++ else
+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
++ fi
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
-
-- case $lt_cv_dlopen in
-- dlopen)
-- save_CPPFLAGS="$CPPFLAGS"
-- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
+dgux*)
+ version_type=linux
+ need_lib_prefix=no
@@ -25534,15 +25599,11 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
-
-- save_LDFLAGS="$LDFLAGS"
-- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
+freebsd1*)
+ dynamic_linker=no
+ ;;
-- save_LIBS="$LIBS"
-- LIBS="$lt_cv_dlopen_libs $LIBS"
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
@@ -25583,10 +25644,36 @@
+ freebsd*) # from 4.6 on
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
-+ ;;
-+ esac
+ ;;
+ esac
+ ;;
+- if test "x$lt_cv_dlopen" != xno; then
+- enable_dlopen=yes
+- else
+- enable_dlopen=no
+- fi
+-
+- case $lt_cv_dlopen in
+- dlopen)
+- save_CPPFLAGS="$CPPFLAGS"
+- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+- save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+- save_LIBS="$LIBS"
+- LIBS="$lt_cv_dlopen_libs $LIBS"
++gnu*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ ;;
+
- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
@@ -25598,21 +25685,8 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20845 "configure"
+-#line 20842 "configure"
-#include "confdefs.h"
-+gnu*)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ hardcode_into_libs=yes
-+ ;;
-
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
@@ -25659,7 +25733,9 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
--#include <stdio.h>
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+interix3*)
+ version_type=linux
+ need_lib_prefix=no
@@ -25672,15 +25748,7 @@
+ hardcode_into_libs=yes
+ ;;
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
+-#include <stdio.h>
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
@@ -25718,6 +25786,20 @@
+ hardcode_into_libs=yes
+ ;;
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++ dynamic_linker=no
++ ;;
+
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
@@ -25739,11 +25821,6 @@
-# endif
-# endif
-#endif
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ version_type=linux
@@ -25862,7 +25939,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<EOF
--#line 20943 "configure"
+-#line 20940 "configure"
-#include "confdefs.h"
+nto-qnx*)
+ version_type=linux
@@ -26142,7 +26219,7 @@
fi
-@@ -21057,7 +22396,8 @@
+@@ -21054,7 +22397,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.
@@ -26152,7 +26229,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 \
-@@ -21157,6 +22497,12 @@
+@@ -21154,6 +22498,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -26165,7 +26242,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21168,6 +22514,9 @@
+@@ -21165,6 +22515,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -26175,7 +26252,7 @@
# A language-specific compiler.
CC=$lt_compiler_GCJ
-@@ -21187,7 +22536,7 @@
+@@ -21184,7 +22537,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -26184,7 +26261,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21218,7 +22567,7 @@
+@@ -21215,7 +22568,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -26193,7 +26270,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21233,7 +22582,7 @@
+@@ -21230,7 +22583,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -26202,7 +26279,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21435,7 +22784,10 @@
+@@ -21432,7 +22785,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.
@@ -26214,7 +26291,7 @@
fi
-@@ -21455,7 +22807,6 @@
+@@ -21452,7 +22808,6 @@
RC)
@@ -26222,7 +26299,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -21474,15 +22825,42 @@
+@@ -21471,15 +22826,42 @@
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -26265,7 +26342,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21498,7 +22876,8 @@
+@@ -21495,7 +22877,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.
@@ -26275,7 +26352,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 \
-@@ -21598,6 +22977,12 @@
+@@ -21595,6 +22978,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -26288,7 +26365,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21609,6 +22994,9 @@
+@@ -21606,6 +22995,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -26298,7 +26375,7 @@
# A language-specific compiler.
CC=$lt_compiler_RC
-@@ -21628,7 +23016,7 @@
+@@ -21625,7 +23017,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -26307,7 +26384,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21659,7 +23047,7 @@
+@@ -21656,7 +23048,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -26316,7 +26393,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21674,7 +23062,7 @@
+@@ -21671,7 +23063,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -26325,7 +26402,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21876,7 +23264,10 @@
+@@ -21873,7 +23265,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.
@@ -26337,7 +26414,7 @@
fi
-@@ -21923,7 +23314,7 @@
+@@ -21920,7 +23315,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -26346,7 +26423,7 @@
# Prevent multiple expansion
-@@ -21978,8 +23369,8 @@
+@@ -21975,8 +23370,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -26357,7 +26434,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22005,17 +23396,17 @@
+@@ -22002,17 +23397,17 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test -n "$MSGFMT"; then
@@ -26381,7 +26458,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22030,32 +23421,33 @@
+@@ -22027,32 +23422,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26423,7 +26500,7 @@
GMSGFMT=":"
fi
MSGFMT=$GMSGFMT
-@@ -22064,8 +23456,8 @@
+@@ -22061,8 +23457,8 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -26434,7 +26511,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22091,11 +23483,11 @@
+@@ -22088,11 +23484,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test -n "$XGETTEXT"; then
@@ -26450,7 +26527,7 @@
fi
-@@ -22103,8 +23495,8 @@
+@@ -22100,8 +23496,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -26461,7 +26538,7 @@
XGETTEXT=":"
fi
fi
-@@ -22114,8 +23506,7 @@
+@@ -22111,8 +23507,7 @@
@@ -26471,7 +26548,7 @@
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'
-@@ -22127,8 +23518,8 @@
+@@ -22124,8 +23519,8 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
@@ -26482,7 +26559,7 @@
if test "${kde_cv_stl_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22156,24 +23547,36 @@
+@@ -22153,24 +23548,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26527,7 +26604,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22182,15 +23585,16 @@
+@@ -22179,15 +23586,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26548,7 +26625,7 @@
if test "$kde_cv_stl_works" = "yes"; then
# back compatible
-@@ -22219,15 +23623,14 @@
+@@ -22216,15 +23624,14 @@
@@ -26567,7 +26644,7 @@
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'
-@@ -22239,9 +23642,6 @@
+@@ -22236,9 +23643,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26577,7 +26654,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22267,24 +23667,36 @@
+@@ -22264,24 +23668,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26622,7 +26699,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22293,9 +23705,10 @@
+@@ -22290,9 +23706,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26635,7 +26712,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22308,11 +23721,11 @@
+@@ -22305,11 +23722,11 @@
fi
@@ -26651,7 +26728,7 @@
if test "${kde_cv_proto_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22333,8 +23746,7 @@
+@@ -22330,8 +23747,7 @@
if test "x$kde_cv_proto_strlcat" = xunknown; then
@@ -26661,7 +26738,7 @@
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'
-@@ -22372,24 +23784,36 @@
+@@ -22369,24 +23785,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26706,7 +26783,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22399,10 +23823,11 @@
+@@ -22396,10 +23824,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26716,11 +26793,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22415,8 +23840,8 @@
+@@ -22412,8 +23841,8 @@
fi
@@ -26731,7 +26808,7 @@
if test "x$kde_cv_func_strlcat" = xyes; then
-@@ -22440,15 +23865,14 @@
+@@ -22437,15 +23866,14 @@
@@ -26750,7 +26827,7 @@
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'
-@@ -22460,9 +23884,6 @@
+@@ -22457,9 +23885,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -26760,7 +26837,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22487,24 +23908,36 @@
+@@ -22484,24 +23909,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26805,7 +26882,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22513,9 +23946,10 @@
+@@ -22510,9 +23947,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26818,7 +26895,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -22528,11 +23962,11 @@
+@@ -22525,11 +23963,11 @@
fi
@@ -26834,7 +26911,7 @@
if test "${kde_cv_proto_strlcpy+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22553,8 +23987,7 @@
+@@ -22550,8 +23988,7 @@
if test "x$kde_cv_proto_strlcpy" = xunknown; then
@@ -26844,7 +26921,7 @@
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'
-@@ -22591,24 +24024,36 @@
+@@ -22588,24 +24025,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26889,7 +26966,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22618,10 +24063,11 @@
+@@ -22615,10 +24064,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26899,11 +26976,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -22634,8 +24080,8 @@
+@@ -22631,8 +24081,8 @@
fi
@@ -26914,7 +26991,7 @@
if test "x$kde_cv_func_strlcpy" = xyes; then
-@@ -22658,8 +24104,8 @@
+@@ -22655,8 +24105,8 @@
@@ -26925,7 +27002,7 @@
if test "${ac_cv_lib_util_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22676,30 +24122,42 @@
+@@ -22673,30 +24123,42 @@
int
main ()
{
@@ -26977,7 +27054,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22708,20 +24166,21 @@
+@@ -22705,20 +24167,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26986,7 +27063,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27005,7 +27082,7 @@
if test "${ac_cv_lib_compat_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22738,30 +24197,42 @@
+@@ -22735,30 +24198,42 @@
int
main ()
{
@@ -27057,7 +27134,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22770,21 +24241,22 @@
+@@ -22767,21 +24242,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27066,7 +27143,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27086,7 +27163,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22797,40 +24269,52 @@
+@@ -22794,40 +24270,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27151,7 +27228,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22839,19 +24323,20 @@
+@@ -22836,19 +24324,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27160,7 +27237,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27178,7 +27255,7 @@
if test "${ac_cv_lib_c_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22864,40 +24349,52 @@
+@@ -22861,40 +24350,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27243,7 +27320,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22906,14 +24403,15 @@
+@@ -22903,14 +24404,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27252,7 +27329,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27263,7 +27340,7 @@
if test $ac_cv_lib_c_crypt = yes; then
kde_have_crypt=yes
else
-@@ -22939,13 +24437,13 @@
+@@ -22936,13 +24438,13 @@
fi
@@ -27280,7 +27357,7 @@
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'
-@@ -22974,24 +24472,36 @@
+@@ -22971,24 +24473,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27325,7 +27402,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23003,8 +24513,10 @@
+@@ -23000,8 +24514,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27337,7 +27414,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23014,17 +24526,17 @@
+@@ -23011,17 +24527,17 @@
fi
@@ -27360,7 +27437,7 @@
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'
-@@ -23053,24 +24565,36 @@
+@@ -23050,24 +24566,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -27405,7 +27482,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23082,8 +24606,10 @@
+@@ -23079,8 +24607,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27417,7 +27494,7 @@
done
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -23094,8 +24620,8 @@
+@@ -23091,8 +24621,8 @@
fi
@@ -27428,7 +27505,7 @@
fi
cat >>confdefs.h <<_ACEOF
-@@ -23108,8 +24634,8 @@
+@@ -23105,8 +24635,8 @@
_ACEOF
@@ -27439,7 +27516,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23122,40 +24648,52 @@
+@@ -23119,40 +24649,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27504,7 +27581,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23164,21 +24702,22 @@
+@@ -23161,21 +24703,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27513,7 +27590,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27533,7 +27610,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23191,40 +24730,52 @@
+@@ -23188,40 +24731,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27598,7 +27675,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23233,21 +24784,22 @@
+@@ -23230,21 +24785,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27607,7 +27684,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27627,7 +27704,7 @@
if test "${ac_cv_func_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23274,53 +24826,59 @@
+@@ -23271,53 +24827,59 @@
#undef inet_ntoa
@@ -27706,7 +27783,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23329,17 +24887,18 @@
+@@ -23326,17 +24888,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27715,7 +27792,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
@@ -27731,7 +27808,7 @@
if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23352,40 +24911,52 @@
+@@ -23349,40 +24912,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27796,7 +27873,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23394,21 +24965,22 @@
+@@ -23391,21 +24966,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27805,7 +27882,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -27825,7 +27902,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23435,53 +25007,59 @@
+@@ -23432,53 +25008,59 @@
#undef connect
@@ -27904,7 +27981,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23490,17 +25068,18 @@
+@@ -23487,17 +25069,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -27913,7 +27990,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -27929,7 +28006,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23513,40 +25092,52 @@
+@@ -23510,40 +25093,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -27994,7 +28071,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23555,22 +25146,23 @@
+@@ -23552,22 +25147,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28003,7 +28080,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28024,7 +28101,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23597,53 +25189,59 @@
+@@ -23594,53 +25190,59 @@
#undef remove
@@ -28103,7 +28180,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23652,17 +25250,18 @@
+@@ -23649,17 +25251,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28112,7 +28189,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -28128,7 +28205,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23675,40 +25274,52 @@
+@@ -23672,40 +25275,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28193,7 +28270,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23717,14 +25328,15 @@
+@@ -23714,14 +25329,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28202,7 +28279,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28213,7 +28290,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23732,8 +25344,8 @@
+@@ -23729,8 +25345,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -28224,7 +28301,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23760,53 +25372,59 @@
+@@ -23757,53 +25373,59 @@
#undef shmat
@@ -28303,7 +28380,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23815,18 +25433,19 @@
+@@ -23812,18 +25434,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28312,7 +28389,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -28329,7 +28406,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23839,40 +25458,52 @@
+@@ -23836,40 +25459,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28394,7 +28471,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23881,14 +25512,15 @@
+@@ -23878,14 +25513,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28403,7 +28480,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28414,7 +28491,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23902,18 +25534,19 @@
+@@ -23899,18 +25535,19 @@
for ac_header in sys/types.h stdint.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28442,7 +28519,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23924,24 +25557,36 @@
+@@ -23921,24 +25558,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28487,7 +28564,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23950,15 +25595,16 @@
+@@ -23947,15 +25596,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28510,7 +28587,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23967,8 +25613,13 @@
+@@ -23964,8 +25614,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28526,7 +28603,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23992,9 +25643,10 @@
+@@ -23989,9 +25644,10 @@
ac_header_preproc=no
fi
@@ -28539,7 +28616,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24018,25 +25670,19 @@
+@@ -24015,25 +25671,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -28572,7 +28649,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24054,18 +25700,19 @@
+@@ -24051,18 +25701,19 @@
for ac_header in sys/bitypes.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28600,7 +28677,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24076,24 +25723,36 @@
+@@ -24073,24 +25724,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28645,7 +28722,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24102,15 +25761,16 @@
+@@ -24099,15 +25762,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28668,7 +28745,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24119,8 +25779,13 @@
+@@ -24116,8 +25780,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28684,7 +28761,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24144,9 +25809,10 @@
+@@ -24141,9 +25810,10 @@
ac_header_preproc=no
fi
@@ -28697,7 +28774,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24170,25 +25836,19 @@
+@@ -24167,25 +25837,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -28730,7 +28807,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24202,8 +25862,8 @@
+@@ -24199,8 +25863,8 @@
# darwin requires a poll emulation library
@@ -28741,7 +28818,7 @@
if test "${ac_cv_lib_poll_poll+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24216,40 +25876,52 @@
+@@ -24213,40 +25877,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28806,7 +28883,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24258,14 +25930,15 @@
+@@ -24255,14 +25931,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28815,7 +28892,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -28826,7 +28903,7 @@
if test $ac_cv_lib_poll_poll = yes; then
LIB_POLL="-lpoll"
fi
-@@ -24276,18 +25949,19 @@
+@@ -24273,18 +25950,19 @@
for ac_header in Carbon/Carbon.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -28854,7 +28931,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24298,24 +25972,36 @@
+@@ -24295,24 +25973,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -28899,7 +28976,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24324,15 +26010,16 @@
+@@ -24321,15 +26011,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28922,7 +28999,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24341,8 +26028,13 @@
+@@ -24338,8 +26029,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -28938,7 +29015,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24366,9 +26058,10 @@
+@@ -24363,9 +26059,10 @@
ac_header_preproc=no
fi
@@ -28951,10 +29028,11 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24392,25 +26085,19 @@
+@@ -24388,26 +26085,20 @@
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
@@ -28963,6 +29041,7 @@
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
;;
esac
@@ -28984,7 +29063,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24425,17 +26112,17 @@
+@@ -24422,17 +26113,17 @@
# CoreAudio framework
if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -29008,7 +29087,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24446,24 +26133,36 @@
+@@ -24443,24 +26134,36 @@
#include <CoreAudio/CoreAudio.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -29053,7 +29132,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24472,15 +26171,16 @@
+@@ -24469,15 +26172,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29076,7 +29155,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24489,8 +26189,13 @@
+@@ -24486,8 +26190,13 @@
/* end confdefs.h. */
#include <CoreAudio/CoreAudio.h>
_ACEOF
@@ -29092,7 +29171,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24514,9 +26219,10 @@
+@@ -24511,9 +26220,10 @@
ac_header_preproc=no
fi
@@ -29105,7 +29184,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24540,25 +26246,18 @@
+@@ -24537,25 +26247,18 @@
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
@@ -29136,7 +29215,7 @@
fi
if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24575,8 +26274,8 @@
+@@ -24572,8 +26275,8 @@
@@ -29147,7 +29226,7 @@
kde_libs_safe="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
cat >conftest.$ac_ext <<_ACEOF
-@@ -24602,31 +26301,43 @@
+@@ -24599,31 +26302,43 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29201,7 +29280,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_RES_INIT 1
-@@ -24637,25 +26348,25 @@
+@@ -24634,25 +26349,25 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29213,7 +29292,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_libs_safe
@@ -29234,7 +29313,7 @@
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'
-@@ -24667,9 +26378,6 @@
+@@ -24664,9 +26379,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -29244,7 +29323,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24695,24 +26403,36 @@
+@@ -24692,24 +26404,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29289,7 +29368,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24721,9 +26441,10 @@
+@@ -24718,9 +26442,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29302,7 +29381,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -24736,11 +26457,11 @@
+@@ -24733,11 +26458,11 @@
fi
@@ -29318,7 +29397,7 @@
if test "${kde_cv_proto_res_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24761,8 +26482,7 @@
+@@ -24758,8 +26483,7 @@
if test "x$kde_cv_proto_res_init" = xunknown; then
@@ -29328,7 +29407,7 @@
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'
-@@ -24800,24 +26520,36 @@
+@@ -24797,24 +26521,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -29373,7 +29452,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24827,10 +26559,11 @@
+@@ -24824,10 +26560,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29383,11 +29462,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -24843,8 +26576,8 @@
+@@ -24840,8 +26577,8 @@
fi
@@ -29398,7 +29477,7 @@
if test "x$kde_cv_func_res_init" = xyes; then
-@@ -24871,8 +26604,8 @@
+@@ -24868,8 +26605,8 @@
LIBSOCKET="$X_EXTRA_LIBS"
@@ -29409,7 +29488,7 @@
if test "${ac_cv_lib_ucb_killpg+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24885,40 +26618,52 @@
+@@ -24882,40 +26619,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29474,7 +29553,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24927,27 +26672,28 @@
+@@ -24924,27 +26673,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29483,7 +29562,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29513,7 +29592,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24960,40 +26706,52 @@
+@@ -24957,40 +26707,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -29578,7 +29657,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25002,22 +26760,23 @@
+@@ -24999,22 +26761,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29587,7 +29666,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -29608,7 +29687,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25028,36 +26787,49 @@
+@@ -25025,36 +26788,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -29668,7 +29747,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25066,20 +26838,21 @@
+@@ -25063,23 +26839,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29686,22 +29765,29 @@
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_int" = yes; then
+- if test "$ac_cv_type_int" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -25092,10 +26865,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25089,10 +26865,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -29710,7 +29796,7 @@
test_array [0] = 0
;
-@@ -25103,24 +26877,36 @@
+@@ -25100,24 +26878,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29755,11 +29841,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25133,10 +26919,11 @@
+@@ -25130,10 +26920,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -29768,7 +29855,7 @@
test_array [0] = 0
;
-@@ -25144,24 +26931,36 @@
+@@ -25141,24 +26933,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29813,7 +29900,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25170,30 +26969,32 @@
+@@ -25167,30 +26971,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29846,7 +29933,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -29855,7 +29943,7 @@
test_array [0] = 0
;
-@@ -25201,24 +27002,36 @@
+@@ -25198,24 +27005,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29900,11 +29988,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25231,10 +27044,11 @@
+@@ -25228,10 +27047,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -29913,7 +30002,7 @@
test_array [0] = 0
;
-@@ -25242,24 +27056,36 @@
+@@ -25239,24 +27060,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -29958,7 +30047,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25268,24 +27094,27 @@
+@@ -25265,24 +27098,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -29996,11 +30085,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25296,10 +27125,11 @@
+@@ -25293,10 +27129,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
int
main ()
{
@@ -30009,7 +30099,7 @@
test_array [0] = 0
;
-@@ -25307,24 +27137,36 @@
+@@ -25304,24 +27142,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30054,7 +30144,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25333,26 +27175,20 @@
+@@ -25330,26 +27180,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30068,13 +30158,17 @@
case $ac_lo in
?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++'') if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -30087,19 +30181,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25360,8 +27196,9 @@
+@@ -25357,8 +27205,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
-+ typedef int ac__type_sizeof_;
++ typedef int ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25370,35 +27207,44 @@
+@@ -25367,35 +27217,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30157,12 +30252,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25409,28 +27255,27 @@
+@@ -25406,28 +27265,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++if test "$ac_cv_type_int" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
+echo "$as_me: error: cannot compute sizeof (int)
@@ -30171,18 +30267,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_int=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_int=0
+-else
+- ac_cv_sizeof_int=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_INT $ac_cv_sizeof_int
_ACEOF
@@ -30194,7 +30296,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25441,36 +27286,49 @@
+@@ -25438,36 +27300,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30254,7 +30356,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25479,20 +27337,21 @@
+@@ -25476,23 +27351,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30272,22 +30374,29 @@
-echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_short" = yes; then
+- if test "$ac_cv_type_short" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -25505,10 +27364,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25502,10 +27377,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30296,7 +30405,7 @@
test_array [0] = 0
;
-@@ -25516,24 +27376,36 @@
+@@ -25513,24 +27390,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30341,11 +30450,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25546,10 +27418,11 @@
+@@ -25543,10 +27432,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30354,7 +30464,7 @@
test_array [0] = 0
;
-@@ -25557,24 +27430,36 @@
+@@ -25554,24 +27445,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30399,7 +30509,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25583,30 +27468,32 @@
+@@ -25580,30 +27483,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30432,7 +30542,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30441,7 +30552,7 @@
test_array [0] = 0
;
-@@ -25614,24 +27501,36 @@
+@@ -25611,24 +27517,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30486,11 +30597,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25644,10 +27543,11 @@
+@@ -25641,10 +27559,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30499,7 +30611,7 @@
test_array [0] = 0
;
-@@ -25655,24 +27555,36 @@
+@@ -25652,24 +27572,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30544,7 +30656,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25681,24 +27593,27 @@
+@@ -25678,24 +27610,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30582,11 +30694,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25709,10 +27624,11 @@
+@@ -25706,10 +27641,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
int
main ()
{
@@ -30595,7 +30708,7 @@
test_array [0] = 0
;
-@@ -25720,24 +27636,36 @@
+@@ -25717,24 +27654,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30640,7 +30753,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25746,26 +27674,20 @@
+@@ -25743,26 +27692,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30654,13 +30767,17 @@
case $ac_lo in
?*) ac_cv_sizeof_short=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++'') if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -30673,19 +30790,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25773,8 +27695,9 @@
+@@ -25770,8 +27717,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (short)); }
-unsigned long ulongval () { return (long) (sizeof (short)); }
-+ typedef short ac__type_sizeof_;
++ typedef short ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -25783,35 +27706,44 @@
+@@ -25780,35 +27729,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -30743,12 +30861,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25822,28 +27754,27 @@
+@@ -25819,28 +27777,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++if test "$ac_cv_type_short" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short), 77
+echo "$as_me: error: cannot compute sizeof (short)
@@ -30757,18 +30876,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_short=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_short=0
+-else
+- ac_cv_sizeof_short=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_SHORT $ac_cv_sizeof_short
_ACEOF
@@ -30780,7 +30905,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25854,36 +27785,49 @@
+@@ -25851,36 +27812,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -30840,7 +30965,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25892,20 +27836,21 @@
+@@ -25889,23 +27863,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -30858,22 +30983,29 @@
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_long" = yes; then
+- if test "$ac_cv_type_long" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -25918,10 +27863,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -25915,10 +27889,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -30882,7 +31014,7 @@
test_array [0] = 0
;
-@@ -25929,24 +27875,36 @@
+@@ -25926,24 +27902,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30927,11 +31059,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25959,10 +27917,11 @@
+@@ -25956,10 +27944,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -30940,7 +31073,7 @@
test_array [0] = 0
;
-@@ -25970,24 +27929,36 @@
+@@ -25967,24 +27957,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -30985,7 +31118,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25996,30 +27967,32 @@
+@@ -25993,30 +27995,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31018,7 +31151,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -31027,7 +31161,7 @@
test_array [0] = 0
;
-@@ -26027,24 +28000,36 @@
+@@ -26024,24 +28029,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31072,11 +31206,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26057,10 +28042,11 @@
+@@ -26054,10 +28071,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -31085,7 +31220,7 @@
test_array [0] = 0
;
-@@ -26068,24 +28054,36 @@
+@@ -26065,24 +28084,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31130,7 +31265,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26094,24 +28092,27 @@
+@@ -26091,24 +28122,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31168,11 +31303,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26122,10 +28123,11 @@
+@@ -26119,10 +28153,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
int
main ()
{
@@ -31181,7 +31317,7 @@
test_array [0] = 0
;
-@@ -26133,24 +28135,36 @@
+@@ -26130,24 +28166,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31226,7 +31362,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26159,26 +28173,20 @@
+@@ -26156,26 +28204,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31240,13 +31376,17 @@
case $ac_lo in
?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++'') if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -31259,19 +31399,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26186,8 +28194,9 @@
+@@ -26183,8 +28229,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef long ac__type_sizeof_;
++ typedef long ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26196,35 +28205,44 @@
+@@ -26193,35 +28241,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31329,12 +31470,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26235,28 +28253,27 @@
+@@ -26232,28 +28289,31 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++if test "$ac_cv_type_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
+echo "$as_me: error: cannot compute sizeof (long)
@@ -31343,18 +31485,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_long=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_long=0
+-else
+- ac_cv_sizeof_long=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
@@ -31366,7 +31514,7 @@
if test "${ac_cv_type_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26267,36 +28284,49 @@
+@@ -26264,36 +28324,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31426,7 +31574,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26305,20 +28335,21 @@
+@@ -26302,23 +28375,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31444,22 +31592,29 @@
-echo "$as_me:$LINENO: checking size of char *" >&5
-echo $ECHO_N "checking size of char *... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of char *" >&5
+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_char_p+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_char_p" = yes; then
+- if test "$ac_cv_type_char_p" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -26331,10 +28362,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26328,10 +28401,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -31468,7 +31623,7 @@
test_array [0] = 0
;
-@@ -26342,24 +28374,36 @@
+@@ -26339,24 +28414,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31513,11 +31668,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26372,10 +28416,11 @@
+@@ -26369,10 +28456,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -31526,7 +31682,7 @@
test_array [0] = 0
;
-@@ -26383,24 +28428,36 @@
+@@ -26380,24 +28469,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31571,7 +31727,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26409,30 +28466,32 @@
+@@ -26406,30 +28507,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31604,7 +31760,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -31613,7 +31770,7 @@
test_array [0] = 0
;
-@@ -26440,24 +28499,36 @@
+@@ -26437,24 +28541,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31658,11 +31815,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26470,10 +28541,11 @@
+@@ -26467,10 +28583,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -31671,7 +31829,7 @@
test_array [0] = 0
;
-@@ -26481,24 +28553,36 @@
+@@ -26478,24 +28596,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31716,7 +31874,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26507,24 +28591,27 @@
+@@ -26504,24 +28634,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31754,11 +31912,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26535,10 +28622,11 @@
+@@ -26532,10 +28665,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
int
main ()
{
@@ -31767,7 +31926,7 @@
test_array [0] = 0
;
-@@ -26546,24 +28634,36 @@
+@@ -26543,24 +28678,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -31812,7 +31971,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26572,26 +28672,20 @@
+@@ -26569,26 +28716,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -31826,13 +31985,17 @@
case $ac_lo in
?*) ac_cv_sizeof_char_p=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++'') if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
+echo "$as_me: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -31845,19 +32008,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26599,8 +28693,9 @@
+@@ -26596,8 +28741,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (char *)); }
-unsigned long ulongval () { return (long) (sizeof (char *)); }
-+ typedef char * ac__type_sizeof_;
++ typedef char * ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -26609,35 +28704,44 @@
+@@ -26606,35 +28753,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -31915,12 +32079,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26648,30 +28752,29 @@
+@@ -26645,30 +28801,33 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++if test "$ac_cv_type_char_p" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char *), 77
+echo "$as_me: error: cannot compute sizeof (char *)
@@ -31929,18 +32094,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_char_p=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_char_p=0
+-else
+- ac_cv_sizeof_char_p=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
_ACEOF
@@ -31954,7 +32125,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26684,40 +28787,52 @@
+@@ -26681,40 +28840,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32019,7 +32190,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26726,14 +28841,15 @@
+@@ -26723,14 +28894,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32028,7 +32199,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32039,7 +32210,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
LIBDL="-ldl"
-@@ -26742,8 +28858,8 @@
+@@ -26739,8 +28911,8 @@
fi
@@ -32050,7 +32221,7 @@
if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26756,40 +28872,52 @@
+@@ -26753,40 +28925,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -32115,7 +32286,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26798,14 +28926,15 @@
+@@ -26795,14 +28979,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32124,7 +32295,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -32135,7 +32306,7 @@
if test $ac_cv_lib_dld_shl_unload = yes; then
LIBDL="-ldld"
-@@ -26819,8 +28948,8 @@
+@@ -26816,8 +29001,8 @@
@@ -32146,7 +32317,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26831,36 +28960,49 @@
+@@ -26828,36 +29013,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32206,7 +32377,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26869,20 +29011,21 @@
+@@ -26866,23 +29064,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32224,22 +32395,29 @@
-echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of size_t" >&5
+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_size_t" = yes; then
+- if test "$ac_cv_type_size_t" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -26895,10 +29038,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -26892,10 +29090,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -32248,7 +32426,7 @@
test_array [0] = 0
;
-@@ -26906,24 +29050,36 @@
+@@ -26903,24 +29103,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32293,11 +32471,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26936,10 +29092,11 @@
+@@ -26933,10 +29145,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -32306,7 +32485,7 @@
test_array [0] = 0
;
-@@ -26947,24 +29104,36 @@
+@@ -26944,24 +29158,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32351,7 +32530,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26973,30 +29142,32 @@
+@@ -26970,30 +29196,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32384,7 +32563,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -32393,7 +32573,7 @@
test_array [0] = 0
;
-@@ -27004,24 +29175,36 @@
+@@ -27001,24 +29230,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32438,11 +32618,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27034,10 +29217,11 @@
+@@ -27031,10 +29272,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -32451,7 +32632,7 @@
test_array [0] = 0
;
-@@ -27045,24 +29229,36 @@
+@@ -27042,24 +29285,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32496,7 +32677,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27071,24 +29267,27 @@
+@@ -27068,24 +29323,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32534,11 +32715,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27099,10 +29298,11 @@
+@@ -27096,10 +29354,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
int
main ()
{
@@ -32547,7 +32729,7 @@
test_array [0] = 0
;
-@@ -27110,24 +29310,36 @@
+@@ -27107,24 +29367,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32592,7 +32774,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27136,26 +29348,20 @@
+@@ -27133,26 +29405,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32606,13 +32788,17 @@
case $ac_lo in
?*) ac_cv_sizeof_size_t=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++'') if test "$ac_cv_type_size_t" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
+echo "$as_me: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -32625,19 +32811,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27163,8 +29369,9 @@
+@@ -27160,8 +29430,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (size_t)); }
-unsigned long ulongval () { return (long) (sizeof (size_t)); }
-+ typedef size_t ac__type_sizeof_;
++ typedef size_t ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27173,35 +29380,44 @@
+@@ -27170,35 +29442,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -32695,12 +32882,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27212,29 +29428,28 @@
+@@ -27209,29 +29490,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++if test "$ac_cv_type_size_t" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
+echo "$as_me: error: cannot compute sizeof (size_t)
@@ -32709,18 +32897,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_size_t=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_size_t=0
+-else
+- ac_cv_sizeof_size_t=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
_ACEOF
@@ -32733,7 +32927,7 @@
if test "${ac_cv_type_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27245,36 +29460,49 @@
+@@ -27242,36 +29526,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -32793,7 +32987,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27283,20 +29511,21 @@
+@@ -27280,23 +29577,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32811,22 +33005,29 @@
-echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_unsigned_long" = yes; then
+- if test "$ac_cv_type_unsigned_long" = yes; then
- # The cast to unsigned long works around a bug in the HP C Compiler
-+ # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
-@@ -27309,10 +29538,11 @@
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -27306,10 +29603,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -32835,7 +33036,7 @@
test_array [0] = 0
;
-@@ -27320,24 +29550,36 @@
+@@ -27317,24 +29616,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32880,11 +33081,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27350,10 +29592,11 @@
+@@ -27347,10 +29658,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -32893,7 +33095,7 @@
test_array [0] = 0
;
-@@ -27361,24 +29604,36 @@
+@@ -27358,24 +29671,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -32938,7 +33140,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27387,30 +29642,32 @@
+@@ -27384,30 +29709,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -32971,7 +33173,8 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -32980,7 +33183,7 @@
test_array [0] = 0
;
-@@ -27418,24 +29675,36 @@
+@@ -27415,24 +29743,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33025,11 +33228,12 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27448,10 +29717,11 @@
+@@ -27445,10 +29785,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -33038,7 +33242,7 @@
test_array [0] = 0
;
-@@ -27459,24 +29729,36 @@
+@@ -27456,24 +29798,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33083,7 +33287,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27485,24 +29767,27 @@
+@@ -27482,24 +29836,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33121,11 +33325,12 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27513,10 +29798,11 @@
+@@ -27510,10 +29867,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
int
main ()
{
@@ -33134,7 +33339,7 @@
test_array [0] = 0
;
-@@ -27524,24 +29810,36 @@
+@@ -27521,24 +29880,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33179,7 +33384,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27550,26 +29848,20 @@
+@@ -27547,26 +29918,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33193,13 +33398,17 @@
case $ac_lo in
?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++'') if test "$ac_cv_type_unsigned_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
+echo "$as_me: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; } ;;
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long=0
++ fi ;;
esac
else
- if test "$cross_compiling" = yes; then
@@ -33212,19 +33421,20 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27577,8 +29869,9 @@
+@@ -27574,8 +29943,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (unsigned long)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-+ typedef unsigned long ac__type_sizeof_;
++ typedef unsigned long ac__type_sizeof_;
++
+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
#include <stdio.h>
#include <stdlib.h>
int
-@@ -27587,35 +29880,44 @@
+@@ -27584,35 +29955,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -33282,12 +33492,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27626,30 +29928,29 @@
+@@ -27623,30 +30003,33 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++if test "$ac_cv_type_unsigned_long" = yes; then
++ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
+echo "$as_me: error: cannot compute sizeof (unsigned long)
@@ -33296,18 +33507,24 @@
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long=0
++ fi
fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
rm -f conftest.val
- else
- ac_cv_sizeof_unsigned_long=0
+-else
+- ac_cv_sizeof_unsigned_long=0
fi
- fi
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
++
++
++
cat >>confdefs.h <<_ACEOF
#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
_ACEOF
@@ -33321,7 +33538,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27670,36 +29971,48 @@
+@@ -27667,36 +30050,48 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -33382,7 +33599,7 @@
{ { echo "$as_me:$LINENO: error:
Apparently on your system our assumption sizeof size_t == sizeof unsigned long
does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27711,18 +30024,18 @@
+@@ -27708,18 +30103,18 @@
{ (exit 1); exit 1; }; }
fi
@@ -33406,7 +33623,7 @@
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'
-@@ -27752,24 +30065,36 @@
+@@ -27749,24 +30144,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33451,7 +33668,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27778,9 +30103,10 @@
+@@ -27775,9 +30182,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33460,11 +33677,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS=$safe_CXXFLAGS
-@@ -27793,26 +30119,26 @@
+@@ -27790,26 +30198,26 @@
fi
@@ -33501,7 +33718,7 @@
KDE_USE_FPIE=""
KDE_USE_PIE=""
-@@ -27831,18 +30157,19 @@
+@@ -27828,18 +30236,19 @@
for ac_header in crt_externs.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33529,7 +33746,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27853,24 +30180,36 @@
+@@ -27850,24 +30259,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -33574,7 +33791,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27879,15 +30218,16 @@
+@@ -27876,15 +30297,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33597,7 +33814,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27896,8 +30236,13 @@
+@@ -27893,8 +30315,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -33613,7 +33830,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -27921,9 +30266,10 @@
+@@ -27918,9 +30345,10 @@
ac_header_preproc=no
fi
@@ -33626,7 +33843,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27947,25 +30293,19 @@
+@@ -27944,25 +30372,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -33659,7 +33876,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27977,8 +30317,8 @@
+@@ -27974,8 +30396,8 @@
done
@@ -33670,7 +33887,7 @@
if test "${ac_cv_func__NSGetEnviron+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28005,53 +30345,59 @@
+@@ -28002,53 +30424,59 @@
#undef _NSGetEnviron
@@ -33749,7 +33966,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28060,13 +30406,14 @@
+@@ -28057,13 +30485,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33758,7 +33975,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
@@ -33768,7 +33985,7 @@
if test $ac_cv_func__NSGetEnviron = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -28087,9 +30434,9 @@
+@@ -28084,9 +30513,9 @@
for ac_func in vsnprintf snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33781,7 +33998,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -28115,53 +30462,59 @@
+@@ -28112,53 +30541,59 @@
#undef $ac_func
@@ -33860,7 +34077,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28170,13 +30523,15 @@
+@@ -28167,13 +30602,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -33869,7 +34086,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -33880,7 +34097,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28193,32 +30548,32 @@
+@@ -28190,32 +30627,32 @@
@@ -33925,7 +34142,7 @@
# used to disable x11-specific stuff on special platforms
-@@ -28234,8 +30589,8 @@
+@@ -28231,8 +30668,8 @@
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
@@ -33936,7 +34153,7 @@
if test "${kde_cv_have_x+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28272,8 +30627,13 @@
+@@ -28269,8 +30706,13 @@
/* end confdefs.h. */
#include <$x_direct_test_include>
_ACEOF
@@ -33952,7 +34169,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28340,6 +30700,7 @@
+@@ -28337,6 +30779,7 @@
fi
done
fi
@@ -33960,7 +34177,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = NO
-@@ -28369,24 +30730,36 @@
+@@ -28366,24 +30809,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34005,7 +34222,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28397,7 +30770,7 @@
+@@ -28394,7 +30849,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34014,17 +34231,17 @@
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28445,7 +30818,8 @@
+@@ -28442,7 +30897,8 @@
done
done
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = NO
-@@ -28455,21 +30829,26 @@
+@@ -28452,21 +30908,26 @@
*-*-solaris*)
;;
*)
@@ -34059,7 +34276,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -28477,7 +30856,7 @@
+@@ -28474,7 +30935,7 @@
# bogus both because they are the default anyway, and because
# using them would break gcc on systems where it needs fixed includes.
case $ac_im_incroot in
@@ -34068,7 +34285,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -28486,7 +30865,7 @@
+@@ -28483,7 +30944,7 @@
esac
fi
cd ..
@@ -34077,7 +34294,7 @@
fi
if test -z "$ac_x_includes"; then
-@@ -28530,12 +30909,12 @@
+@@ -28527,12 +30988,12 @@
eval "$kde_cv_have_x"
if test "$have_x" != yes; then
@@ -34094,7 +34311,7 @@
fi
if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28563,8 +30942,8 @@
+@@ -28560,8 +31021,8 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
@@ -34105,7 +34322,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28577,40 +30956,52 @@
+@@ -28574,40 +31035,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34170,7 +34387,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28619,14 +31010,15 @@
+@@ -28616,14 +31089,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34179,7 +34396,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -34190,7 +34407,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
LIBSM="-lSM -lICE"
fi
-@@ -28635,8 +31027,8 @@
+@@ -28632,8 +31106,8 @@
LIB_X11='-lX11 $(LIBSOCKET)'
@@ -34201,7 +34418,7 @@
if test "${kde_cv_have_libXext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28670,24 +31062,36 @@
+@@ -28667,24 +31141,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34246,7 +34463,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28696,10 +31100,11 @@
+@@ -28693,10 +31179,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34256,11 +34473,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$kde_ldflags_safe
-@@ -28708,8 +31113,8 @@
+@@ -28705,8 +31192,8 @@
fi
@@ -34271,7 +34488,7 @@
if test "$kde_cv_have_libXext" = "no"; then
{ { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28855,8 +31260,8 @@
+@@ -28852,8 +31339,8 @@
else
PTHREAD_LIBS_save="$PTHREAD_LIBS"
PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -34282,7 +34499,7 @@
kde_save_LDFLAGS="$LDFLAGS"
kde_save_LIBS="$LIBS"
-@@ -28867,9 +31272,9 @@
+@@ -28864,9 +31351,9 @@
;;
esac
as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -34295,7 +34512,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -28881,40 +31286,52 @@
+@@ -28878,40 +31365,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34360,7 +34577,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28923,14 +31340,16 @@
+@@ -28920,14 +31419,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34369,7 +34586,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -34381,7 +34598,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
LIBPTHREAD="$PTHREAD_LIBS_save"
fi
-@@ -28943,8 +31362,8 @@
+@@ -28940,8 +31441,8 @@
fi
if test -z "$LIBPTHREAD"; then
@@ -34392,7 +34609,7 @@
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28957,40 +31376,52 @@
+@@ -28954,40 +31455,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -34457,7 +34674,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28999,14 +31430,15 @@
+@@ -28996,14 +31509,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34466,7 +34683,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -34477,7 +34694,7 @@
if test $ac_cv_lib_pthread_pthread_create = yes; then
LIBPTHREAD="-lpthread"
fi
-@@ -29014,8 +31446,8 @@
+@@ -29011,8 +31525,8 @@
fi
if test -z "$LIBPTHREAD" ; then
@@ -34488,7 +34705,7 @@
kde_safe_libs=$LIBS
LIBS="$LIBS -lpthread"
cat >conftest.$ac_ext <<_ACEOF
-@@ -29034,40 +31466,53 @@
+@@ -29031,40 +31545,53 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34551,11 +34768,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
fi
-@@ -29082,16 +31527,15 @@
+@@ -29079,16 +31606,15 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
@@ -34576,7 +34793,7 @@
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'
-@@ -29118,24 +31562,36 @@
+@@ -29115,24 +31641,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34621,7 +34838,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29144,8 +31600,10 @@
+@@ -29141,8 +31679,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34629,11 +34846,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29158,13 +31616,13 @@
+@@ -29155,13 +31695,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34651,7 +34868,7 @@
:
fi
-@@ -29176,16 +31634,15 @@
+@@ -29173,16 +31713,15 @@
case $host_os in
solaris*)
@@ -34672,7 +34889,7 @@
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'
-@@ -29212,24 +31669,36 @@
+@@ -29209,24 +31748,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34717,7 +34934,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29238,8 +31707,10 @@
+@@ -29235,8 +31786,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34725,11 +34942,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CXXFLAGS="$save_CXXFLAGS"
ac_ext=c
-@@ -29252,13 +31723,13 @@
+@@ -29249,13 +31802,13 @@
fi
if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -34747,7 +34964,7 @@
:
fi
-@@ -29285,17 +31756,17 @@
+@@ -29282,17 +31835,17 @@
@@ -34771,7 +34988,7 @@
kde_extra_includes=
if test -n "$kde_use_extra_includes" && \
test "$kde_use_extra_includes" != "NONE"; then
-@@ -29313,21 +31784,21 @@
+@@ -29310,21 +31863,21 @@
fi
@@ -34801,7 +35018,7 @@
if test -n "$kde_use_extra_libs" && \
test "$kde_use_extra_libs" != "NONE"; then
-@@ -29346,14 +31817,14 @@
+@@ -29343,14 +31896,14 @@
@@ -34820,7 +35037,7 @@
if test "${ac_cv_lib_z+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29387,24 +31858,36 @@
+@@ -29384,24 +31937,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34865,7 +35082,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29413,9 +31896,10 @@
+@@ -29410,9 +31975,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34874,11 +35091,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29428,8 +31912,8 @@
+@@ -29425,8 +31991,8 @@
_ACEOF
LIBZ="$ac_cv_lib_z"
@@ -34889,7 +35106,7 @@
else
{ { echo "$as_me:$LINENO: error: not found.
Possibly configure picks up an outdated version
-@@ -29449,8 +31933,8 @@
+@@ -29446,8 +32012,8 @@
@@ -34900,7 +35117,7 @@
if test "${ac_cv_lib_png+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29486,24 +31970,36 @@
+@@ -29483,24 +32049,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34945,7 +35162,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29512,10 +32008,11 @@
+@@ -29509,10 +32087,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -34955,11 +35172,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$kde_save_LIBS"
CFLAGS="$kde_save_CFLAGS"
-@@ -29529,19 +32026,19 @@
+@@ -29526,19 +32105,19 @@
LIBPNG="$ac_cv_lib_png"
@@ -34985,7 +35202,7 @@
if test "${ac_cv_lib_jpeg_6b+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29574,24 +32071,36 @@
+@@ -29571,24 +32150,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35030,7 +35247,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29600,9 +32109,10 @@
+@@ -29597,9 +32188,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35039,11 +35256,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29612,14 +32122,14 @@
+@@ -29609,14 +32201,14 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -35064,7 +35281,7 @@
if test "${ac_cv_lib_jpeg_normal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29652,24 +32162,36 @@
+@@ -29649,24 +32241,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35109,7 +35326,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29678,9 +32200,10 @@
+@@ -29675,9 +32279,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35118,11 +35335,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
-@@ -29690,11 +32213,11 @@
+@@ -29687,11 +32292,11 @@
if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -35138,16 +35355,16 @@
LIBJPEG=
-@@ -29714,7 +32237,7 @@
+@@ -29711,7 +32316,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29717: $i/$j" >&5
-+ echo "configure: 32240: $i/$j" >&5
+- echo "configure: 29714: $i/$j" >&5
++ echo "configure: 32319: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29761,14 +32284,14 @@
+@@ -29758,14 +32363,14 @@
@@ -35165,7 +35382,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29811,8 +32334,8 @@
+@@ -29808,8 +32413,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35176,7 +35393,7 @@
{ { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
We need perl to generate some code." >&5
-@@ -29821,8 +32344,8 @@
+@@ -29818,8 +32423,8 @@
{ (exit 1); exit 1; }; }
else
@@ -35187,7 +35404,7 @@
PERL=$kde_cv_path
fi
-@@ -29836,10 +32359,9 @@
+@@ -29833,10 +32438,9 @@
@@ -35200,7 +35417,7 @@
else
if test $kde_qtver = 3; then
-@@ -29849,7 +32371,8 @@
+@@ -29846,7 +32450,8 @@
fi
@@ -35210,7 +35427,7 @@
USING_QT_MT=""
-@@ -29869,13 +32392,13 @@
+@@ -29866,13 +32471,13 @@
else
kde_check_threading_default=yes
fi
@@ -35228,7 +35445,7 @@
if test "x$kde_use_threading" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
-@@ -29947,8 +32470,8 @@
+@@ -29944,8 +32549,8 @@
LIBQT="$LIBQT $LIBDL"
fi
@@ -35239,7 +35456,7 @@
if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29957,34 +32480,34 @@
+@@ -29954,34 +32559,34 @@
qt_libraries=""
qt_includes=""
@@ -35286,16 +35503,16 @@
if test "${ac_cv_have_qt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30012,7 +32535,7 @@
+@@ -30009,7 +32614,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 30015: $i/$j" >&5
-+ echo "configure: 32538: $i/$j" >&5
+- echo "configure: 30012: $i/$j" >&5
++ echo "configure: 32617: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30049,8 +32572,7 @@
+@@ -30046,8 +32651,7 @@
ac_qt_libraries="$qt_libdir"
@@ -35305,7 +35522,7 @@
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'
-@@ -30187,13 +32709,13 @@
+@@ -30184,13 +32788,13 @@
eval "$ac_cv_have_qt"
if test "$have_qt" != yes; then
@@ -35323,7 +35540,7 @@
qt_libraries="$ac_qt_libraries"
qt_includes="$ac_qt_includes"
-@@ -30202,15 +32724,14 @@
+@@ -30199,15 +32803,14 @@
if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
@@ -35342,7 +35559,7 @@
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'
-@@ -30331,12 +32852,12 @@
+@@ -30328,12 +32931,12 @@
if test "$kde_cv_qt_direct" = "yes"; then
@@ -35359,7 +35576,7 @@
fi
-@@ -30374,14 +32895,14 @@
+@@ -30371,14 +32974,14 @@
fi
@@ -35377,7 +35594,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30424,8 +32945,8 @@
+@@ -30421,8 +33024,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35388,7 +35605,7 @@
{ { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
Please check whether you installed Qt correctly.
-@@ -30446,22 +32967,22 @@
+@@ -30443,22 +33046,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35416,7 +35633,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30504,12 +33025,12 @@
+@@ -30501,12 +33104,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35433,7 +35650,7 @@
UIC_PATH=$kde_cv_path
fi
-@@ -30539,10 +33060,10 @@
+@@ -30536,10 +33139,10 @@
if test $kde_qtver = 3; then
@@ -35447,7 +35664,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30565,22 +33086,22 @@
+@@ -30562,22 +33165,22 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35477,7 +35694,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30603,13 +33124,13 @@
+@@ -30600,13 +33203,13 @@
if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -35495,7 +35712,7 @@
:
ac_uic_supports_nounload=no
fi
-@@ -30640,15 +33161,14 @@
+@@ -30637,15 +33240,14 @@
if test -n "$LIBJPEG"; then
@@ -35514,7 +35731,7 @@
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'
-@@ -30681,24 +33201,36 @@
+@@ -30678,24 +33280,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35559,7 +35776,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30707,9 +33239,10 @@
+@@ -30704,9 +33318,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -35568,11 +35785,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30725,12 +33258,12 @@
+@@ -30722,12 +33337,12 @@
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -35589,7 +35806,7 @@
LIBJPEG_QT=
fi
-@@ -30761,15 +33294,15 @@
+@@ -30758,15 +33373,15 @@
@@ -35611,7 +35828,7 @@
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-@@ -30793,11 +33326,11 @@
+@@ -30790,11 +33405,11 @@
@@ -35627,34 +35844,34 @@
if test "${prefix}" != NONE; then
kde_includes=${includedir}
-@@ -30849,7 +33382,7 @@
+@@ -30846,7 +33461,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30852: $i/$j" >&5
-+ echo "configure: 33385: $i/$j" >&5
+- echo "configure: 30849: $i/$j" >&5
++ echo "configure: 33464: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30879,7 +33412,7 @@
+@@ -30876,7 +33491,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30882: $i/$j" >&5
-+ echo "configure: 33415: $i/$j" >&5
+- echo "configure: 30879: $i/$j" >&5
++ echo "configure: 33494: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30897,7 +33430,7 @@
+@@ -30894,7 +33509,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30900: $i/$j" >&5
-+ echo "configure: 33433: $i/$j" >&5
+- echo "configure: 30897: $i/$j" >&5
++ echo "configure: 33512: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -30956,12 +33489,12 @@
+@@ -30953,12 +33568,12 @@
fi
if test "$exec_prefix" = NONE; then
ac_kde_exec_prefix="$ac_kde_prefix"
@@ -35671,7 +35888,7 @@
fi
kde_libraries="${libdir}"
-@@ -30970,8 +33503,8 @@
+@@ -30967,8 +33582,8 @@
else
ac_cv_have_kde="have_kde=yes \
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -35682,7 +35899,7 @@
kde_libraries="$ac_kde_libraries"
kde_includes="$ac_kde_includes"
-@@ -31009,8 +33542,8 @@
+@@ -31006,8 +33621,8 @@
if test x$ac_uic_supports_libpath = xyes; then
@@ -35693,7 +35910,7 @@
if test "${kde_cv_uic_plugins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31053,8 +33586,8 @@
+@@ -31050,8 +33665,8 @@
fi
@@ -35704,7 +35921,7 @@
if test "$kde_cv_uic_plugins" != yes; then
{ { echo "$as_me:$LINENO: error:
you need to install kdelibs first.
-@@ -31086,10 +33619,9 @@
+@@ -31083,10 +33698,9 @@
@@ -35717,7 +35934,7 @@
if test "$enableval" = "no";
then ac_use_path_checking="default"
else ac_use_path_checking=""
-@@ -31103,13 +33635,14 @@
+@@ -31100,13 +33714,14 @@
fi
@@ -35735,7 +35952,7 @@
kde_result=""
kde_cached_paths=yes
if test "${kde_cv_all_paths+set}" = set; then
-@@ -31220,15 +33753,14 @@
+@@ -31217,15 +33832,14 @@
else
if test $kde_qtver = 1; then
@@ -35756,7 +35973,7 @@
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'
-@@ -31280,8 +33812,8 @@
+@@ -31277,8 +33891,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35767,7 +35984,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31320,8 +33852,8 @@
+@@ -31317,8 +33931,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35778,7 +35995,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31329,8 +33861,8 @@
+@@ -31326,8 +33940,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35789,7 +36006,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31523,15 +34055,14 @@
+@@ -31520,15 +34134,14 @@
else
if test $kde_qtver = 1; then
@@ -35810,7 +36027,7 @@
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'
-@@ -31583,8 +34114,8 @@
+@@ -31580,8 +34193,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -35821,7 +36038,7 @@
else
{ { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
Check, if you installed the KDE header files correctly.
-@@ -31623,8 +34154,8 @@
+@@ -31620,8 +34233,8 @@
KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
fi
@@ -35832,7 +36049,7 @@
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31632,8 +34163,8 @@
+@@ -31629,8 +34242,8 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest; then
@@ -35843,7 +36060,7 @@
else
{ { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-@@ -31725,22 +34256,22 @@
+@@ -31722,22 +34335,22 @@
{ (exit 1); exit 1; }; }
else
rm -f conftest*
@@ -35872,7 +36089,7 @@
if test "$build_arts" '!=' "no"; then
-@@ -31773,14 +34304,14 @@
+@@ -31770,14 +34383,14 @@
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
@@ -35890,7 +36107,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31823,8 +34354,8 @@
+@@ -31820,8 +34433,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35901,7 +36118,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
Please check whether you installed KDE correctly.
-@@ -31835,21 +34366,21 @@
+@@ -31832,21 +34445,21 @@
{ (exit 1); exit 1; }; }
else
@@ -35928,7 +36145,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31892,8 +34423,8 @@
+@@ -31889,8 +34502,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35939,7 +36156,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
Please check whether you installed KDE correctly.
-@@ -31904,22 +34435,22 @@
+@@ -31901,22 +34514,22 @@
{ (exit 1); exit 1; }; }
else
@@ -35967,7 +36184,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31962,8 +34493,8 @@
+@@ -31959,8 +34572,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35978,7 +36195,7 @@
{ { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
Please check whether you installed aRts correctly or use
-@@ -31976,21 +34507,21 @@
+@@ -31973,21 +34586,21 @@
{ (exit 1); exit 1; }; }
else
@@ -36005,7 +36222,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32033,8 +34564,8 @@
+@@ -32030,8 +34643,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36016,7 +36233,7 @@
{ { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
Please check whether you installed aRts correctly or use
-@@ -32047,22 +34578,22 @@
+@@ -32044,22 +34657,22 @@
{ (exit 1); exit 1; }; }
else
@@ -36044,7 +36261,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32105,12 +34636,12 @@
+@@ -32102,12 +34715,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36061,7 +36278,7 @@
MEINPROC=$kde_cv_path
fi
-@@ -32139,14 +34670,14 @@
+@@ -32136,14 +34749,14 @@
if test -n "$kde32ornewer"; then
@@ -36079,7 +36296,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32189,8 +34720,8 @@
+@@ -32186,8 +34799,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36090,7 +36307,7 @@
{ { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
Please check whether you installed KDE correctly.
-@@ -32201,21 +34732,21 @@
+@@ -32198,21 +34811,21 @@
{ (exit 1); exit 1; }; }
else
@@ -36117,7 +36334,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32258,8 +34789,8 @@
+@@ -32255,8 +34868,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36128,7 +36345,7 @@
{ { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
Please check whether you installed KDE correctly.
-@@ -32270,8 +34801,8 @@
+@@ -32267,8 +34880,8 @@
{ (exit 1); exit 1; }; }
else
@@ -36139,7 +36356,7 @@
DCOPIDLNG=$kde_cv_path
fi
-@@ -32279,14 +34810,14 @@
+@@ -32276,14 +34889,14 @@
fi
if test -n "$kde33ornewer"; then
@@ -36157,7 +36374,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32329,8 +34860,8 @@
+@@ -32326,8 +34939,8 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36168,7 +36385,7 @@
{ { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
Please check whether you installed KDE correctly.
-@@ -32341,8 +34872,8 @@
+@@ -32338,8 +34951,8 @@
{ (exit 1); exit 1; }; }
else
@@ -36179,7 +36396,7 @@
MAKEKDEWIDGETS=$kde_cv_path
fi
-@@ -32350,14 +34881,14 @@
+@@ -32347,14 +34960,14 @@
fi
@@ -36197,7 +36414,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32400,12 +34931,12 @@
+@@ -32397,12 +35010,12 @@
fi
if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36214,16 +36431,16 @@
XMLLINT=$kde_cv_path
fi
-@@ -32420,7 +34951,7 @@
+@@ -32417,7 +35030,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32423: $i/$j" >&5
-+ echo "configure: 34954: $i/$j" >&5
+- echo "configure: 32420: $i/$j" >&5
++ echo "configure: 35033: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32580,15 +35111,14 @@
+@@ -32577,15 +35190,14 @@
@@ -36242,7 +36459,7 @@
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'
-@@ -32600,9 +35130,6 @@
+@@ -32597,9 +35209,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36252,7 +36469,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32625,24 +35152,36 @@
+@@ -32622,24 +35231,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -36297,7 +36514,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32651,9 +35190,10 @@
+@@ -32648,9 +35269,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36310,7 +36527,7 @@
CXXFLAGS="$save_CXXFLAGS"
LIBS="$kde_safe_LIBS"
ac_ext=c
-@@ -32666,11 +35206,11 @@
+@@ -32663,11 +35285,11 @@
fi
@@ -36326,7 +36543,7 @@
if test "${kde_cv_proto_setenv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32691,8 +35231,7 @@
+@@ -32688,8 +35310,7 @@
if test "x$kde_cv_proto_setenv" = xunknown; then
@@ -36336,7 +36553,7 @@
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'
-@@ -32727,24 +35266,36 @@
+@@ -32724,24 +35345,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36381,7 +36598,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32754,10 +35305,11 @@
+@@ -32751,10 +35384,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36391,11 +36608,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$kde_safe_libs
ac_ext=c
-@@ -32770,8 +35322,8 @@
+@@ -32767,8 +35401,8 @@
fi
@@ -36406,7 +36623,7 @@
if test "x$kde_cv_func_setenv" = xyes; then
-@@ -32801,8 +35353,7 @@
+@@ -32798,8 +35432,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36416,7 +36633,7 @@
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'
-@@ -32812,17 +35363,17 @@
+@@ -32809,17 +35442,17 @@
if test "${ac_cv_header_atlantik_ui_board_h+set}" = set; then
@@ -36440,7 +36657,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32833,24 +35384,36 @@
+@@ -32830,24 +35463,36 @@
#include <atlantik/ui/board.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36485,7 +36702,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32859,15 +35422,16 @@
+@@ -32856,15 +35501,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36508,7 +36725,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32876,8 +35440,13 @@
+@@ -32873,8 +35519,13 @@
/* end confdefs.h. */
#include <atlantik/ui/board.h>
_ACEOF
@@ -36524,7 +36741,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -32901,9 +35470,10 @@
+@@ -32898,9 +35549,10 @@
ac_header_preproc=no
fi
@@ -36537,7 +36754,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -32927,25 +35497,18 @@
+@@ -32924,25 +35576,18 @@
echo "$as_me: WARNING: atlantik/ui/board.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: atlantik/ui/board.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: atlantik/ui/board.h: in the future, the compiler will take precedence" >&2;}
@@ -36568,7 +36785,7 @@
fi
if test $ac_cv_header_atlantik_ui_board_h = yes; then
-@@ -32971,8 +35534,7 @@
+@@ -32968,8 +35613,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -36578,7 +36795,7 @@
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'
-@@ -32982,17 +35544,17 @@
+@@ -32979,17 +35623,17 @@
if test "${ac_cv_header_kaddressbook_xxport_h+set}" = set; then
@@ -36602,7 +36819,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33003,24 +35565,36 @@
+@@ -33000,24 +35644,36 @@
#include <kaddressbook/xxport.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -36647,7 +36864,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33029,15 +35603,16 @@
+@@ -33026,15 +35682,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36670,7 +36887,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33046,8 +35621,13 @@
+@@ -33043,8 +35700,13 @@
/* end confdefs.h. */
#include <kaddressbook/xxport.h>
_ACEOF
@@ -36686,7 +36903,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33071,9 +35651,10 @@
+@@ -33068,9 +35730,10 @@
ac_header_preproc=no
fi
@@ -36699,7 +36916,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -33097,25 +35678,18 @@
+@@ -33094,25 +35757,18 @@
echo "$as_me: WARNING: kaddressbook/xxport.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: kaddressbook/xxport.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: kaddressbook/xxport.h: in the future, the compiler will take precedence" >&2;}
@@ -36730,7 +36947,7 @@
fi
if test $ac_cv_header_kaddressbook_xxport_h = yes; then
-@@ -33144,26 +35718,26 @@
+@@ -33141,26 +35797,26 @@
ssl_libraries=""
ssl_includes=""
@@ -36767,16 +36984,16 @@
if test "${ac_cv_have_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -33178,7 +35752,7 @@
+@@ -33175,7 +35831,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 33181: $i/$j" >&5
-+ echo "configure: 35755: $i/$j" >&5
+- echo "configure: 33178: $i/$j" >&5
++ echo "configure: 35834: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -33225,24 +35799,36 @@
+@@ -33222,24 +35878,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36821,7 +37038,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33252,10 +35838,11 @@
+@@ -33249,10 +35917,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36831,11 +37048,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS="$ac_ldflags_safe"
-@@ -33273,26 +35860,26 @@
+@@ -33270,26 +35939,26 @@
eval "$ac_cv_have_ssl"
@@ -36875,7 +37092,7 @@
if test "${ac_cv_ssl_version+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33365,8 +35952,8 @@
+@@ -33362,8 +36031,8 @@
eval "$ac_cv_ssl_version"
@@ -36886,7 +37103,7 @@
fi
if test "$have_ssl" != yes; then
-@@ -33432,18 +36019,19 @@
+@@ -33429,18 +36098,19 @@
for ac_header in fcntl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36914,7 +37131,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33454,24 +36042,36 @@
+@@ -33451,24 +36121,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -36959,7 +37176,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33480,15 +36080,16 @@
+@@ -33477,15 +36159,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -36982,7 +37199,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -33497,8 +36098,13 @@
+@@ -33494,8 +36177,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -36998,7 +37215,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -33522,9 +36128,10 @@
+@@ -33519,9 +36207,10 @@
ac_header_preproc=no
fi
@@ -37011,7 +37228,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33548,25 +36155,19 @@
+@@ -33545,25 +36234,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -37044,7 +37261,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33578,8 +36179,8 @@
+@@ -33575,8 +36258,8 @@
done
@@ -37055,7 +37272,7 @@
if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33592,40 +36193,52 @@
+@@ -33589,40 +36272,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37120,7 +37337,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33634,14 +36247,15 @@
+@@ -33631,14 +36326,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37129,7 +37346,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -37140,7 +37357,7 @@
if test $ac_cv_lib_kstat_kstat_open = yes; then
LIBKSTAT="-lkstat"
fi
-@@ -33652,18 +36266,18 @@
+@@ -33649,18 +36345,18 @@
@@ -37165,7 +37382,7 @@
if test "${ac_cv_have_xmms+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33690,24 +36304,36 @@
+@@ -33687,24 +36383,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37210,7 +37427,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33716,10 +36342,11 @@
+@@ -33713,10 +36421,11 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37220,11 +37437,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_libs"
LDFLAGS="$ac_LDFLAGS_save"
-@@ -33727,8 +36354,8 @@
+@@ -33724,8 +36433,8 @@
fi
@@ -37235,7 +37452,7 @@
if test "$ac_cv_have_xmms" = "yes"; then
XMMS_LIBS="`xmms-config --libs`"
XMMS_INCLUDES="`xmms-config --cflags`"
-@@ -33752,8 +36379,8 @@
+@@ -33749,8 +36458,8 @@
#MIN_CONFIG(3.2.0)
@@ -37246,7 +37463,17 @@
if test "${ac_cv_c_bigendian+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -33779,24 +36406,36 @@
+@@ -33767,7 +36476,8 @@
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+ bogus endian macros
+ #endif
+
+@@ -33776,24 +36486,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37291,7 +37518,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33822,24 +36461,36 @@
+@@ -33819,24 +36541,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37336,7 +37563,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33848,14 +36499,15 @@
+@@ -33845,14 +36579,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37355,7 +37582,7 @@
if test "$cross_compiling" = yes; then
# try to guess the endianness by grepping values into an object file
ac_cv_c_bigendian=unknown
-@@ -33865,11 +36517,11 @@
+@@ -33862,11 +36597,11 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37371,7 +37598,7 @@
void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
int
main ()
-@@ -33880,24 +36532,36 @@
+@@ -33877,24 +36612,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -37416,7 +37643,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33916,8 +36580,10 @@
+@@ -33913,8 +36660,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37428,7 +37655,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -33925,27 +36591,41 @@
+@@ -33922,27 +36671,41 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -37477,7 +37704,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -33958,13 +36638,16 @@
+@@ -33955,13 +36718,16 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
@@ -37498,7 +37725,7 @@
case $ac_cv_c_bigendian in
yes)
-@@ -33983,8 +36666,8 @@
+@@ -33980,8 +36746,8 @@
esac
@@ -37509,7 +37736,7 @@
if test "${ac_cv_maxpathlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34020,8 +36703,8 @@
+@@ -34017,8 +36783,8 @@
fi
@@ -37520,7 +37747,7 @@
cat >>confdefs.h <<_ACEOF
#define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -34052,39 +36735,39 @@
+@@ -34049,39 +36815,39 @@
noatun_sdl=no
@@ -37576,7 +37803,7 @@
if test x$sdl_exec_prefix != x ; then
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-@@ -34101,8 +36784,8 @@
+@@ -34098,8 +36864,8 @@
# Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-config; ac_word=$2
@@ -37587,7 +37814,7 @@
if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -34117,31 +36800,32 @@
+@@ -34114,31 +36880,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -37628,7 +37855,7 @@
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
-@@ -34230,13 +36914,22 @@
+@@ -34227,13 +36994,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -37655,7 +37882,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34249,19 +36942,21 @@
+@@ -34246,19 +37022,21 @@
( exit $ac_status )
no_sdl=yes
fi
@@ -37682,7 +37909,7 @@
if test "$SDL_CONFIG" = "no" ; then
echo "*** The sdl-config script installed by SDL could not be found"
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -34293,24 +36988,36 @@
+@@ -34290,24 +37068,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37727,7 +37954,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34327,12 +37034,13 @@
+@@ -34324,12 +37114,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37739,11 +37966,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
-@@ -34369,18 +37077,19 @@
+@@ -34366,18 +37157,19 @@
for ac_header in endian.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37771,7 +37998,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34391,24 +37100,36 @@
+@@ -34388,24 +37180,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -37816,7 +38043,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34417,15 +37138,16 @@
+@@ -34414,15 +37218,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -37839,7 +38066,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34434,8 +37156,13 @@
+@@ -34431,8 +37236,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -37855,7 +38082,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34459,9 +37186,10 @@
+@@ -34456,9 +37266,10 @@
ac_header_preproc=no
fi
@@ -37868,7 +38095,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34485,25 +37213,19 @@
+@@ -34482,25 +37293,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -37901,7 +38128,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34521,8 +37243,7 @@
+@@ -34518,8 +37323,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -37911,7 +38138,7 @@
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'
-@@ -34532,17 +37253,17 @@
+@@ -34529,17 +37333,17 @@
if test "${ac_cv_header_noatun_app_h+set}" = set; then
@@ -37935,7 +38162,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34553,24 +37274,36 @@
+@@ -34550,24 +37354,36 @@
#include <noatun/app.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -37980,7 +38207,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34579,15 +37312,16 @@
+@@ -34576,15 +37392,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38003,7 +38230,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34596,8 +37330,13 @@
+@@ -34593,8 +37410,13 @@
/* end confdefs.h. */
#include <noatun/app.h>
_ACEOF
@@ -38019,7 +38246,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34621,9 +37360,10 @@
+@@ -34618,9 +37440,10 @@
ac_header_preproc=no
fi
@@ -38032,7 +38259,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34647,25 +37387,18 @@
+@@ -34644,25 +37467,18 @@
echo "$as_me: WARNING: noatun/app.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: noatun/app.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: noatun/app.h: in the future, the compiler will take precedence" >&2;}
@@ -38063,7 +38290,7 @@
fi
if test $ac_cv_header_noatun_app_h = yes; then
-@@ -34692,22 +37425,22 @@
+@@ -34689,22 +37505,22 @@
@@ -38094,7 +38321,7 @@
berkeley_db=no
if test "x$with_berkeley_db" != xno; then
-@@ -34717,8 +37450,7 @@
+@@ -34714,8 +37530,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
@@ -38104,7 +38331,7 @@
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'
-@@ -34728,17 +37460,17 @@
+@@ -34725,17 +37540,17 @@
if test "${ac_cv_header_db_cxx_h+set}" = set; then
@@ -38128,7 +38355,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34749,24 +37481,36 @@
+@@ -34746,24 +37561,36 @@
#include <db_cxx.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -38173,7 +38400,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34775,15 +37519,16 @@
+@@ -34772,15 +37599,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38196,7 +38423,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34792,8 +37537,13 @@
+@@ -34789,8 +37617,13 @@
/* end confdefs.h. */
#include <db_cxx.h>
_ACEOF
@@ -38212,7 +38439,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -34817,9 +37567,10 @@
+@@ -34814,9 +37647,10 @@
ac_header_preproc=no
fi
@@ -38225,7 +38452,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -34843,25 +37594,18 @@
+@@ -34840,25 +37674,18 @@
echo "$as_me: WARNING: db_cxx.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: db_cxx.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: db_cxx.h: in the future, the compiler will take precedence" >&2;}
@@ -38256,7 +38483,7 @@
fi
if test $ac_cv_header_db_cxx_h = yes; then
-@@ -34881,9 +37625,9 @@
+@@ -34878,9 +37705,9 @@
as_ac_Lib=`echo "ac_cv_lib_$ac_db_name''_main" | $as_tr_sh`
@@ -38269,7 +38496,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -34899,30 +37643,42 @@
+@@ -34896,30 +37723,42 @@
int
main ()
{
@@ -38321,7 +38548,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -34931,14 +37687,16 @@
+@@ -34928,14 +37767,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38330,7 +38557,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -38342,7 +38569,7 @@
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
:
else
-@@ -34994,8 +37752,8 @@
+@@ -34991,8 +37832,8 @@
fi
for i in $ac_topsubdirs; do
@@ -38353,7 +38580,7 @@
if test -d $srcdir/$i; then
install_it="yes"
for j in $DO_NOT_COMPILE; do
-@@ -35006,8 +37764,8 @@
+@@ -35003,8 +37844,8 @@
else
install_it="no"
fi
@@ -38364,7 +38591,7 @@
vari=`echo $i | sed -e 's,[-+.@],_,g'`
if test $install_it = "yes"; then
TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -35129,243 +37887,243 @@
+@@ -35126,243 +37967,243 @@
renamedlgplugins_SUBDIR_included_FALSE=
fi
@@ -38727,7 +38954,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -35385,39 +38143,58 @@
+@@ -35382,39 +38223,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -38802,7 +39029,7 @@
fi
fi
rm -f confcache
-@@ -35426,38 +38203,31 @@
+@@ -35423,38 +38283,31 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -38854,7 +39081,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
-@@ -35636,11 +38406,35 @@
+@@ -35633,11 +38486,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -38892,7 +39119,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -35649,8 +38443,43 @@
+@@ -35646,8 +38523,43 @@
fi
@@ -38937,7 +39164,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -35664,18 +38493,19 @@
+@@ -35661,18 +38573,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -38960,7 +39187,7 @@
as_basename=basename
else
as_basename=false
-@@ -35683,159 +38513,120 @@
+@@ -35680,159 +38593,120 @@
# Name of the executable.
@@ -39191,7 +39418,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -35844,7 +38635,19 @@
+@@ -35841,7 +38715,19 @@
as_mkdir_p=false
fi
@@ -39212,7 +39439,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -35853,31 +38656,14 @@
+@@ -35850,31 +38736,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -39244,11 +39471,11 @@
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -35885,30 +38671,20 @@
+@@ -35882,30 +38751,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -39287,7 +39514,16 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -35935,19 +38711,21 @@
+@@ -35913,7 +38772,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+- -V, --version print version number, then exit
++ -V, --version print version number and configuration settings, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+@@ -35932,19 +38791,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -39299,7 +39535,7 @@
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.60a,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
@@ -39315,7 +39551,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -35958,39 +38736,24 @@
+@@ -35955,39 +38816,24 @@
do
case $1 in
--*=*)
@@ -39361,7 +39597,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -36000,18 +38763,24 @@
+@@ -35997,18 +38843,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -39391,7 +39627,7 @@
esac
shift
-@@ -36027,155 +38796,167 @@
+@@ -36024,155 +38876,167 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -39688,7 +39924,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -36187,533 +38968,684 @@
+@@ -36184,533 +39048,684 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -40845,7 +41081,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
$extrasub
-@@ -36721,248 +39653,130 @@
+@@ -36718,248 +39733,130 @@
cat >>$CONFIG_STATUS <<\_ACEOF
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -41194,7 +41430,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -36973,135 +39787,39 @@
+@@ -36970,135 +39867,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -41356,7 +41592,7 @@
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
-@@ -37111,18 +39829,29 @@
+@@ -37108,18 +39909,29 @@
# each Makefile.in and add a new line on top of each file to say so.
# So let's grep whole file.
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -41394,7 +41630,7 @@
else
continue
fi
-@@ -37144,53 +39873,79 @@
+@@ -37141,53 +39953,79 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -41503,19 +41739,21 @@
{ (exit 0); exit 0; }
_ACEOF
---- configure.in
-+++ configure.in
+diff -ur kdeaddons-3.5.5.old/configure.in kdeaddons-3.5.5/configure.in
+--- kdeaddons-3.5.5.old/configure.in 2006-10-02 19:37:17.000000000 +0200
++++ kdeaddons-3.5.5/configure.in 2006-10-10 01:33:49.000000000 +0200
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeaddons, "3.5.4") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeaddons, "3.5.5") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
---- doc/kate-plugins/Makefile.in
-+++ doc/kate-plugins/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/kate-plugins/Makefile.in kdeaddons-3.5.5/doc/kate-plugins/Makefile.in
+--- kdeaddons-3.5.5.old/doc/kate-plugins/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/kate-plugins/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -92,6 +92,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -41601,6 +41839,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -346,9 +355,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kate-plugins/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/kate-plugins/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/kate-plugins/Makefile
++#>- $(AUTOMAKE) --gnu doc/kate-plugins/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -358,9 +367,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kate-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/kate-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/kate-plugins/Makefile
++ $(AUTOMAKE) --gnu doc/kate-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/kate-plugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -375,9 +384,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41613,45 +41875,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -522,10 +531,10 @@
- .NOEXPORT:
+@@ -579,9 +588,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kate-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/kate-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/kate-plugins/Makefile
++ $(AUTOMAKE) --gnu doc/kate-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/kate-plugins/Makefile.in
- #>+ 2
--KDE_DIST=openheader.docbook index.docbook insertcommand.docbook configure_insertcommand.png Makefile.in insertcommand.png htmltools.docbook filetemplates.docbook textfilter.docbook xmlcheck.docbook Makefile.am xmltools.docbook index.cache.bz2
-+KDE_DIST=openheader.docbook insertcommand.docbook Makefile.in textfilter.docbook index.docbook configure_insertcommand.png insertcommand.png htmltools.docbook filetemplates.docbook Makefile.am xmlcheck.docbook xmltools.docbook index.cache.bz2
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) htmltools.docbook xmltools.docbook configure_insertcommand.png insertcommand.docbook index.docbook openheader.docbook textfilter.docbook filetemplates.docbook xmlcheck.docbook insertcommand.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) filetemplates.docbook openheader.docbook textfilter.docbook configure_insertcommand.png xmlcheck.docbook insertcommand.docbook htmltools.docbook xmltools.docbook index.docbook insertcommand.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -552,20 +561,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate-plugins
-- @for base in htmltools.docbook xmltools.docbook configure_insertcommand.png insertcommand.docbook index.docbook openheader.docbook textfilter.docbook filetemplates.docbook xmlcheck.docbook insertcommand.png ; do \
-+ @for base in filetemplates.docbook openheader.docbook textfilter.docbook configure_insertcommand.png xmlcheck.docbook insertcommand.docbook htmltools.docbook xmltools.docbook index.docbook insertcommand.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate-plugins/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate-plugins/$$base ;\
- done
-
- uninstall-nls:
-- for base in htmltools.docbook xmltools.docbook configure_insertcommand.png insertcommand.docbook index.docbook openheader.docbook textfilter.docbook filetemplates.docbook xmlcheck.docbook insertcommand.png ; do \
-+ for base in filetemplates.docbook openheader.docbook textfilter.docbook configure_insertcommand.png xmlcheck.docbook insertcommand.docbook htmltools.docbook xmltools.docbook index.docbook insertcommand.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate-plugins/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in htmltools.docbook xmltools.docbook configure_insertcommand.png insertcommand.docbook index.docbook openheader.docbook textfilter.docbook filetemplates.docbook xmlcheck.docbook insertcommand.png ; do \
-+ for file in filetemplates.docbook openheader.docbook textfilter.docbook configure_insertcommand.png xmlcheck.docbook insertcommand.docbook htmltools.docbook xmltools.docbook index.docbook insertcommand.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
---- doc/kicker-applets/Makefile.in
-+++ doc/kicker-applets/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/kicker-applets/Makefile.in kdeaddons-3.5.5/doc/kicker-applets/Makefile.in
+--- kdeaddons-3.5.5.old/doc/kicker-applets/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/kicker-applets/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -92,6 +92,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -41737,6 +41975,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -346,9 +355,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kicker-applets/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/kicker-applets/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/kicker-applets/Makefile
++#>- $(AUTOMAKE) --gnu doc/kicker-applets/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -358,9 +367,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kicker-applets/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/kicker-applets/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/kicker-applets/Makefile
++ $(AUTOMAKE) --gnu doc/kicker-applets/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/kicker-applets/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -375,9 +384,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41749,45 +42011,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -522,10 +531,10 @@
- .NOEXPORT:
+@@ -579,9 +588,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/kicker-applets/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/kicker-applets/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/kicker-applets/Makefile
++ $(AUTOMAKE) --gnu doc/kicker-applets/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/kicker-applets/Makefile.in
- #>+ 2
--KDE_DIST=kolourpicker.docbook index.docbook Makefile.in Makefile.am ktimemon.docbook index.cache.bz2
-+KDE_DIST=kolourpicker.docbook Makefile.in ktimemon.docbook index.docbook Makefile.am index.cache.bz2
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kolourpicker.docbook ktimemon.docbook index.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) ktimemon.docbook index.docbook kolourpicker.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -552,20 +561,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker-applets
-- @for base in kolourpicker.docbook ktimemon.docbook index.docbook ; do \
-+ @for base in ktimemon.docbook index.docbook kolourpicker.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker-applets/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker-applets/$$base ;\
- done
-
- uninstall-nls:
-- for base in kolourpicker.docbook ktimemon.docbook index.docbook ; do \
-+ for base in ktimemon.docbook index.docbook kolourpicker.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker-applets/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in kolourpicker.docbook ktimemon.docbook index.docbook ; do \
-+ for file in ktimemon.docbook index.docbook kolourpicker.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
---- doc/konq-plugins/babel/Makefile.in
-+++ doc/konq-plugins/babel/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/babel/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/babel/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/babel/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/babel/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -41873,6 +42111,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/babel/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/babel/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/babel/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/babel/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/babel/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/babel/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/babel/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/babel/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/babel/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41885,17 +42147,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/babel/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/babel/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/babel/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/babel/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/babel/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/crashes/Makefile.in
-+++ doc/konq-plugins/crashes/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/crashes/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/crashes/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/crashes/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/crashes/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -41981,6 +42247,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/crashes/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/crashes/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/crashes/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/crashes/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/crashes/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/crashes/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/crashes/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/crashes/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/crashes/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -41993,17 +42283,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/crashes/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/crashes/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/crashes/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/crashes/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/crashes/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/dirfilter/Makefile.in
-+++ doc/konq-plugins/dirfilter/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/dirfilter/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/dirfilter/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/dirfilter/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/dirfilter/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -42089,6 +42383,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/dirfilter/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/dirfilter/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/dirfilter/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/dirfilter/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/dirfilter/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/dirfilter/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/dirfilter/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/dirfilter/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/dirfilter/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42101,17 +42419,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/dirfilter/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/dirfilter/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/dirfilter/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/dirfilter/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/dirfilter/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/domtreeviewer/Makefile.in
-+++ doc/konq-plugins/domtreeviewer/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/domtreeviewer/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/domtreeviewer/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/domtreeviewer/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/domtreeviewer/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -42197,6 +42519,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/domtreeviewer/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/domtreeviewer/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/domtreeviewer/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/domtreeviewer/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/domtreeviewer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/domtreeviewer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/domtreeviewer/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/domtreeviewer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/domtreeviewer/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42209,17 +42555,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/domtreeviewer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/domtreeviewer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/domtreeviewer/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/domtreeviewer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/domtreeviewer/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/fsview/Makefile.in
-+++ doc/konq-plugins/fsview/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/fsview/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/fsview/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/fsview/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/fsview/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -42305,6 +42655,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/fsview/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/fsview/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/fsview/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/fsview/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/fsview/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/fsview/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/fsview/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/fsview/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/fsview/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42317,17 +42691,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/fsview/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/fsview/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/fsview/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/fsview/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/fsview/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/imgallery/Makefile.in
-+++ doc/konq-plugins/imgallery/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/imgallery/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/imgallery/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/imgallery/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/imgallery/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -42413,6 +42791,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/imgallery/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/imgallery/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/imgallery/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/imgallery/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/imgallery/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/imgallery/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/imgallery/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/imgallery/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/imgallery/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42425,45 +42827,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,10 +698,10 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/imgallery/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/imgallery/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/imgallery/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/imgallery/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/imgallery/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in thumbnails.png Makefile.am index.cache.bz2 look.png folders.png
-+KDE_DIST=Makefile.in thumbnails.png look.png index.docbook Makefile.am index.cache.bz2 folders.png
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook folders.png look.png thumbnails.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) folders.png thumbnails.png look.png index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -719,20 +728,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konq-plugins/imgallery
-- @for base in index.docbook folders.png look.png thumbnails.png ; do \
-+ @for base in folders.png thumbnails.png look.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konq-plugins/imgallery/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konq-plugins/imgallery/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook folders.png look.png thumbnails.png ; do \
-+ for base in folders.png thumbnails.png look.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konq-plugins/imgallery/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook folders.png look.png thumbnails.png ; do \
-+ for file in folders.png thumbnails.png look.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
---- doc/konq-plugins/khtmlsettings/Makefile.in
-+++ doc/konq-plugins/khtmlsettings/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/khtmlsettings/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/khtmlsettings/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/khtmlsettings/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/khtmlsettings/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -42549,6 +42927,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/khtmlsettings/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/khtmlsettings/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/khtmlsettings/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/khtmlsettings/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/khtmlsettings/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/khtmlsettings/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/khtmlsettings/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/khtmlsettings/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/khtmlsettings/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42561,17 +42963,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/khtmlsettings/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/khtmlsettings/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/khtmlsettings/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/khtmlsettings/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/khtmlsettings/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/kuick/Makefile.in
-+++ doc/konq-plugins/kuick/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/kuick/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/kuick/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/kuick/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/kuick/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -42657,6 +43063,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/kuick/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/kuick/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/kuick/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/kuick/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/kuick/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/kuick/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/kuick/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/kuick/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/kuick/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42669,17 +43099,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/kuick/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/kuick/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/kuick/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/kuick/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/kuick/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/Makefile.in
-+++ doc/konq-plugins/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -42756,15 +43190,6 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
renamedlgplugins_SUBDIR_included_FALSE = @renamedlgplugins_SUBDIR_included_FALSE@
-@@ -348,7 +357,7 @@
- xdg_menudir = @xdg_menudir@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. khtmlsettings domtreeviewer webarchiver fsview dirfilter babel imgallery kuick crashes validators mediaplayer uachanger
-+SUBDIRS =. crashes babel kuick webarchiver domtreeviewer imgallery khtmlsettings validators fsview uachanger mediaplayer dirfilter
- KDE_LANG = en
- KDE_DOCS = AUTO
- #>- all: all-recursive
@@ -356,7 +365,7 @@
all: docs-am all-recursive
@@ -42774,6 +43199,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42786,17 +43235,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/mediaplayer/Makefile.in
-+++ doc/konq-plugins/mediaplayer/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/mediaplayer/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/mediaplayer/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/mediaplayer/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/mediaplayer/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -42882,6 +43335,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/mediaplayer/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/mediaplayer/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/mediaplayer/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/mediaplayer/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/mediaplayer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/mediaplayer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/mediaplayer/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/mediaplayer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/mediaplayer/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -42894,17 +43371,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/mediaplayer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/mediaplayer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/mediaplayer/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/mediaplayer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/mediaplayer/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/uachanger/Makefile.in
-+++ doc/konq-plugins/uachanger/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/uachanger/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/uachanger/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/uachanger/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/uachanger/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -42990,6 +43471,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/uachanger/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/uachanger/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/uachanger/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/uachanger/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/uachanger/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/uachanger/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/uachanger/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/uachanger/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/uachanger/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43002,17 +43507,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/uachanger/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/uachanger/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/uachanger/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/uachanger/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/uachanger/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/validators/Makefile.in
-+++ doc/konq-plugins/validators/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/validators/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/validators/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/validators/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/validators/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -43098,6 +43607,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/validators/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/validators/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/validators/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/validators/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/validators/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/validators/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/validators/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/validators/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/validators/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43110,17 +43643,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/validators/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/validators/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/validators/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/validators/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/validators/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/konq-plugins/webarchiver/Makefile.in
-+++ doc/konq-plugins/webarchiver/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/konq-plugins/webarchiver/Makefile.in kdeaddons-3.5.5/doc/konq-plugins/webarchiver/Makefile.in
+--- kdeaddons-3.5.5.old/doc/konq-plugins/webarchiver/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/konq-plugins/webarchiver/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -43206,6 +43743,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/webarchiver/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/webarchiver/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/konq-plugins/webarchiver/Makefile
++#>- $(AUTOMAKE) --gnu doc/konq-plugins/webarchiver/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/webarchiver/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/webarchiver/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/webarchiver/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/webarchiver/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/webarchiver/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43218,17 +43779,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -689,7 +698,7 @@
- .NOEXPORT:
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/konq-plugins/webarchiver/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/konq-plugins/webarchiver/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/konq-plugins/webarchiver/Makefile
++ $(AUTOMAKE) --gnu doc/konq-plugins/webarchiver/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/konq-plugins/webarchiver/Makefile.in
- #>+ 2
--KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-+KDE_DIST=Makefile.in index.docbook Makefile.am index.cache.bz2
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
---- doc/Makefile.in
-+++ doc/Makefile.in
+diff -ur kdeaddons-3.5.5.old/doc/Makefile.in kdeaddons-3.5.5/doc/Makefile.in
+--- kdeaddons-3.5.5.old/doc/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/doc/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -43305,14 +43870,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
renamedlgplugins_SUBDIR_included_FALSE = @renamedlgplugins_SUBDIR_included_FALSE@
-@@ -350,13 +359,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kate-plugins konq-plugins kicker-applets
-+SUBDIRS =. kicker-applets konq-plugins kate-plugins
- #>- all: all-recursive
- #>+ 1
+@@ -356,7 +365,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -43321,6 +43879,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign doc/Makefile
++#>- $(AUTOMAKE) --gnu doc/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/Makefile
++ $(AUTOMAKE) --gnu doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43333,8 +43915,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kaddressbook-plugins/Makefile.in
-+++ kaddressbook-plugins/Makefile.in
+@@ -698,9 +707,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign doc/Makefile
++ $(AUTOMAKE) --gnu doc/Makefile
+ cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kaddressbook-plugins/Makefile.in kdeaddons-3.5.5/kaddressbook-plugins/Makefile.in
+--- kdeaddons-3.5.5.old/kaddressbook-plugins/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/kaddressbook-plugins/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -43420,6 +44015,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -361,9 +370,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kaddressbook-plugins/Makefile
++#>- $(AUTOMAKE) --gnu kaddressbook-plugins/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -373,9 +382,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kaddressbook-plugins/Makefile
++ $(AUTOMAKE) --gnu kaddressbook-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kaddressbook-plugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -390,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43432,8 +44051,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kaddressbook-plugins/xxports/gmx/Makefile.in
-+++ kaddressbook-plugins/xxports/gmx/Makefile.in
+@@ -694,9 +703,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kaddressbook-plugins/Makefile
++ $(AUTOMAKE) --gnu kaddressbook-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kaddressbook-plugins/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kaddressbook-plugins/xxports/gmx/Makefile.in kdeaddons-3.5.5/kaddressbook-plugins/xxports/gmx/Makefile.in
+--- kdeaddons-3.5.5.old/kaddressbook-plugins/xxports/gmx/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/kaddressbook-plugins/xxports/gmx/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -137,6 +137,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -43519,6 +44151,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -402,9 +411,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/gmx/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/gmx/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/gmx/Makefile
++#>- $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/gmx/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -414,9 +423,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/gmx/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/gmx/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/gmx/Makefile
++ $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/gmx/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kaddressbook-plugins/xxports/gmx/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -431,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43531,17 +44187,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -752,7 +761,7 @@
- -rm -f gmx_xxport.moc
+@@ -771,9 +780,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/gmx/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/gmx/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/gmx/Makefile
++ $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/gmx/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kaddressbook-plugins/xxports/gmx/Makefile.in
- #>+ 2
--KDE_DIST=gmx_xxportui.rc Makefile.in Makefile.am gmx_xxport.h gmx_xxport.desktop
-+KDE_DIST=Makefile.in gmx_xxport.desktop gmx_xxport.h gmx_xxportui.rc Makefile.am
- #>+ 3
- clean-closures:
---- kaddressbook-plugins/xxports/kworldclock/Makefile.in
-+++ kaddressbook-plugins/xxports/kworldclock/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kaddressbook-plugins/xxports/kworldclock/Makefile.in kdeaddons-3.5.5/kaddressbook-plugins/xxports/kworldclock/Makefile.in
+--- kdeaddons-3.5.5.old/kaddressbook-plugins/xxports/kworldclock/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/kaddressbook-plugins/xxports/kworldclock/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -137,6 +137,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -43627,6 +44287,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -400,9 +409,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/kworldclock/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/kworldclock/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/kworldclock/Makefile
++#>- $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/kworldclock/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -412,9 +421,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/kworldclock/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/kworldclock/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/kworldclock/Makefile
++ $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/kworldclock/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kaddressbook-plugins/xxports/kworldclock/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -429,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43639,8 +44323,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kaddressbook-plugins/xxports/Makefile.in
-+++ kaddressbook-plugins/xxports/Makefile.in
+@@ -769,9 +778,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/kworldclock/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/kworldclock/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/kworldclock/Makefile
++ $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/kworldclock/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kaddressbook-plugins/xxports/kworldclock/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kaddressbook-plugins/xxports/Makefile.in kdeaddons-3.5.5/kaddressbook-plugins/xxports/Makefile.in
+--- kdeaddons-3.5.5.old/kaddressbook-plugins/xxports/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/kaddressbook-plugins/xxports/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -43726,6 +44423,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -361,9 +370,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/Makefile
++#>- $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -373,9 +382,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/Makefile
++ $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kaddressbook-plugins/xxports/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -390,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43738,8 +44459,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kate/cppsymbolviewer/Makefile.in
-+++ kate/cppsymbolviewer/Makefile.in
+@@ -694,9 +703,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kaddressbook-plugins/xxports/Makefile
++ $(AUTOMAKE) --gnu kaddressbook-plugins/xxports/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kaddressbook-plugins/xxports/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kate/cppsymbolviewer/Makefile.in kdeaddons-3.5.5/kate/cppsymbolviewer/Makefile.in
+--- kdeaddons-3.5.5.old/kate/cppsymbolviewer/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/kate/cppsymbolviewer/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -141,6 +141,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -43825,6 +44559,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -405,9 +414,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/cppsymbolviewer/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/cppsymbolviewer/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/cppsymbolviewer/Makefile
++#>- $(AUTOMAKE) --gnu kate/cppsymbolviewer/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/cppsymbolviewer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/cppsymbolviewer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/cppsymbolviewer/Makefile
++ $(AUTOMAKE) --gnu kate/cppsymbolviewer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/cppsymbolviewer/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -434,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43837,17 +44595,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -758,7 +767,7 @@
- -rm -f plugin_katesymbolviewer.moc
+@@ -777,9 +786,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/cppsymbolviewer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/cppsymbolviewer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/cppsymbolviewer/Makefile
++ $(AUTOMAKE) --gnu kate/cppsymbolviewer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/cppsymbolviewer/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in ui.rc katecppsymbolviewer.desktop testfile.c plugin_katesymbolviewer.h Makefile.am
-+KDE_DIST=Makefile.in testfile.c ui.rc katecppsymbolviewer.desktop plugin_katesymbolviewer.h Makefile.am
- #>+ 3
- clean-closures:
---- kate/filelistloader/Makefile.in
-+++ kate/filelistloader/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/filelistloader/Makefile.in kdeaddons-3.5.5/kate/filelistloader/Makefile.in
+--- kdeaddons-3.5.5.old/kate/filelistloader/Makefile.in 2006-10-02 19:38:27.000000000 +0200
++++ kdeaddons-3.5.5/kate/filelistloader/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -137,6 +137,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -43933,6 +44695,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -417,9 +426,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filelistloader/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filelistloader/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/filelistloader/Makefile
++#>- $(AUTOMAKE) --gnu kate/filelistloader/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -429,9 +438,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filelistloader/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filelistloader/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/filelistloader/Makefile
++ $(AUTOMAKE) --gnu kate/filelistloader/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/filelistloader/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -446,9 +455,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -43945,17 +44731,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -797,7 +806,7 @@
- -rm -f katefll_plugin.moc katefll_initplugin.moc
+@@ -816,9 +825,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filelistloader/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filelistloader/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/filelistloader/Makefile
++ $(AUTOMAKE) --gnu kate/filelistloader/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/filelistloader/Makefile.in
- #>+ 2
--KDE_DIST=katefll_plugin.desktop katefll.desktop katefll_plugin.h Makefile.in ui.rc Makefile.am katefll_initplugin.desktop katefll_initplugin.h
-+KDE_DIST=katefll.desktop katefll_plugin.h Makefile.in katefll_plugin.desktop ui.rc Makefile.am katefll_initplugin.h katefll_initplugin.desktop
- #>+ 3
- clean-closures:
---- kate/filetemplates/Makefile.in
-+++ kate/filetemplates/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/filetemplates/Makefile.in kdeaddons-3.5.5/kate/filetemplates/Makefile.in
+--- kdeaddons-3.5.5.old/kate/filetemplates/Makefile.in 2006-10-02 19:38:27.000000000 +0200
++++ kdeaddons-3.5.5/kate/filetemplates/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44041,6 +44831,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -361,9 +370,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filetemplates/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filetemplates/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/filetemplates/Makefile
++#>- $(AUTOMAKE) --gnu kate/filetemplates/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -373,9 +382,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filetemplates/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filetemplates/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/filetemplates/Makefile
++ $(AUTOMAKE) --gnu kate/filetemplates/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/filetemplates/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -390,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44053,8 +44867,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kate/filetemplates/plugin/Makefile.in
-+++ kate/filetemplates/plugin/Makefile.in
+@@ -694,9 +703,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filetemplates/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filetemplates/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/filetemplates/Makefile
++ $(AUTOMAKE) --gnu kate/filetemplates/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/filetemplates/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kate/filetemplates/plugin/Makefile.in kdeaddons-3.5.5/kate/filetemplates/plugin/Makefile.in
+--- kdeaddons-3.5.5.old/kate/filetemplates/plugin/Makefile.in 2006-10-02 19:38:27.000000000 +0200
++++ kdeaddons-3.5.5/kate/filetemplates/plugin/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44140,6 +44967,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -407,9 +416,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filetemplates/plugin/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filetemplates/plugin/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/filetemplates/plugin/Makefile
++#>- $(AUTOMAKE) --gnu kate/filetemplates/plugin/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -419,9 +428,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filetemplates/plugin/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filetemplates/plugin/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/filetemplates/plugin/Makefile
++ $(AUTOMAKE) --gnu kate/filetemplates/plugin/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/filetemplates/plugin/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -436,9 +445,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44152,17 +45003,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -779,7 +788,7 @@
- -rm -f filetemplates.moc
+@@ -798,9 +807,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filetemplates/plugin/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filetemplates/plugin/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/filetemplates/plugin/Makefile
++ $(AUTOMAKE) --gnu kate/filetemplates/plugin/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/filetemplates/plugin/Makefile.in
- #>+ 2
--KDE_DIST=filetemplates.h Makefile.in ui.rc Makefile.am katefiletemplates.desktop katetemplate.xml
-+KDE_DIST=filetemplates.h Makefile.in katetemplate.xml katefiletemplates.desktop ui.rc Makefile.am
- #>+ 3
- clean-closures:
---- kate/filetemplates/templates/Makefile.in
-+++ kate/filetemplates/templates/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/filetemplates/templates/Makefile.in kdeaddons-3.5.5/kate/filetemplates/templates/Makefile.in
+--- kdeaddons-3.5.5.old/kate/filetemplates/templates/Makefile.in 2006-10-02 19:38:27.000000000 +0200
++++ kdeaddons-3.5.5/kate/filetemplates/templates/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -102,6 +102,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44248,6 +45103,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -360,9 +369,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filetemplates/templates/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filetemplates/templates/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/filetemplates/templates/Makefile
++#>- $(AUTOMAKE) --gnu kate/filetemplates/templates/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +381,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filetemplates/templates/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filetemplates/templates/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/filetemplates/templates/Makefile
++ $(AUTOMAKE) --gnu kate/filetemplates/templates/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/filetemplates/templates/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -389,9 +398,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44260,8 +45139,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kate/helloworld/Makefile.in
-+++ kate/helloworld/Makefile.in
+@@ -566,9 +575,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/filetemplates/templates/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/filetemplates/templates/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/filetemplates/templates/Makefile
++ $(AUTOMAKE) --gnu kate/filetemplates/templates/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/filetemplates/templates/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kate/helloworld/Makefile.in kdeaddons-3.5.5/kate/helloworld/Makefile.in
+--- kdeaddons-3.5.5.old/kate/helloworld/Makefile.in 2006-10-02 19:38:27.000000000 +0200
++++ kdeaddons-3.5.5/kate/helloworld/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -136,6 +136,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44347,6 +45239,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -400,9 +409,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/helloworld/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/helloworld/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/helloworld/Makefile
++#>- $(AUTOMAKE) --gnu kate/helloworld/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -412,9 +421,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/helloworld/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/helloworld/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/helloworld/Makefile
++ $(AUTOMAKE) --gnu kate/helloworld/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/helloworld/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -429,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44359,17 +45275,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -751,7 +760,7 @@
- -rm -f plugin_katehelloworld.moc
+@@ -770,9 +779,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/helloworld/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/helloworld/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/helloworld/Makefile
++ $(AUTOMAKE) --gnu kate/helloworld/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/helloworld/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in katehelloworld.desktop ui.rc plugin_katehelloworld.h Makefile.am
-+KDE_DIST=Makefile.in katehelloworld.desktop ui.rc Makefile.am plugin_katehelloworld.h
- #>+ 3
- clean-closures:
---- kate/htmltools/Makefile.in
-+++ kate/htmltools/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/htmltools/Makefile.in kdeaddons-3.5.5/kate/htmltools/Makefile.in
+--- kdeaddons-3.5.5.old/kate/htmltools/Makefile.in 2006-10-02 19:38:27.000000000 +0200
++++ kdeaddons-3.5.5/kate/htmltools/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44455,6 +45375,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -405,9 +414,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/htmltools/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/htmltools/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/htmltools/Makefile
++#>- $(AUTOMAKE) --gnu kate/htmltools/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/htmltools/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/htmltools/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/htmltools/Makefile
++ $(AUTOMAKE) --gnu kate/htmltools/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/htmltools/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -434,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44467,17 +45411,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -756,7 +765,7 @@
- -rm -f plugin_katehtmltools.moc
+@@ -775,9 +784,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/htmltools/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/htmltools/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/htmltools/Makefile
++ $(AUTOMAKE) --gnu kate/htmltools/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/htmltools/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in plugin_katehtmltools.h ui.rc katehtmltools.desktop Makefile.am
-+KDE_DIST=Makefile.in katehtmltools.desktop plugin_katehtmltools.h ui.rc Makefile.am
- #>+ 3
- clean-closures:
---- kate/insertcommand/Makefile.in
-+++ kate/insertcommand/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/insertcommand/Makefile.in kdeaddons-3.5.5/kate/insertcommand/Makefile.in
+--- kdeaddons-3.5.5.old/kate/insertcommand/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/insertcommand/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -136,6 +136,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44563,6 +45511,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -406,9 +415,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/insertcommand/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/insertcommand/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/insertcommand/Makefile
++#>- $(AUTOMAKE) --gnu kate/insertcommand/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/insertcommand/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/insertcommand/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/insertcommand/Makefile
++ $(AUTOMAKE) --gnu kate/insertcommand/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/insertcommand/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -435,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44575,17 +45547,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -757,7 +766,7 @@
- -rm -f plugin_kateinsertcommand.moc
+@@ -776,9 +785,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/insertcommand/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/insertcommand/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/insertcommand/Makefile
++ $(AUTOMAKE) --gnu kate/insertcommand/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/insertcommand/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in ui.rc Makefile.am plugin_kateinsertcommand.h kateinsertcommand.desktop
-+KDE_DIST=Makefile.in kateinsertcommand.desktop ui.rc Makefile.am plugin_kateinsertcommand.h
- #>+ 3
- clean-closures:
---- kate/kjswrapper/Makefile.in
-+++ kate/kjswrapper/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/kjswrapper/Makefile.in kdeaddons-3.5.5/kate/kjswrapper/Makefile.in
+--- kdeaddons-3.5.5.old/kate/kjswrapper/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/kjswrapper/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -150,6 +150,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44671,6 +45647,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -415,9 +424,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/kjswrapper/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/kjswrapper/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/kjswrapper/Makefile
++#>- $(AUTOMAKE) --gnu kate/kjswrapper/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -427,9 +436,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/kjswrapper/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/kjswrapper/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/kjswrapper/Makefile
++ $(AUTOMAKE) --gnu kate/kjswrapper/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/kjswrapper/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -444,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44683,8 +45683,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kate/kjswrapper/samples/Makefile.in
-+++ kate/kjswrapper/samples/Makefile.in
+@@ -858,9 +867,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/kjswrapper/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/kjswrapper/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/kjswrapper/Makefile
++ $(AUTOMAKE) --gnu kate/kjswrapper/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/kjswrapper/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kate/kjswrapper/samples/Makefile.in kdeaddons-3.5.5/kate/kjswrapper/samples/Makefile.in
+--- kdeaddons-3.5.5.old/kate/kjswrapper/samples/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/kjswrapper/samples/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -114,6 +114,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44770,6 +45783,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -376,9 +385,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/kjswrapper/samples/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/kjswrapper/samples/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/kjswrapper/samples/Makefile
++#>- $(AUTOMAKE) --gnu kate/kjswrapper/samples/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -388,9 +397,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/kjswrapper/samples/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/kjswrapper/samples/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/kjswrapper/samples/Makefile
++ $(AUTOMAKE) --gnu kate/kjswrapper/samples/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/kjswrapper/samples/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -405,9 +414,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44782,17 +45819,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -628,7 +637,7 @@
- .NOEXPORT:
+@@ -643,9 +652,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/kjswrapper/samples/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/kjswrapper/samples/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/kjswrapper/samples/Makefile
++ $(AUTOMAKE) --gnu kate/kjswrapper/samples/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/kjswrapper/samples/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in katekjstest1.js katekjsconsolewindow.rc katekjstest1.desktop katekjsconsolewindow.js katekjsselect.rc Makefile.am katekjsselect.js katekjsselect.desktop katekjsconsolewindow.desktop
-+KDE_DIST=katekjstest1.js Makefile.in katekjsselect.rc katekjsconsolewindow.js katekjsconsolewindow.rc katekjstest1.desktop katekjsselect.js Makefile.am katekjsselect.desktop katekjsconsolewindow.desktop
- #>+ 2
- docs-am:
---- kate/kpybrowser/Makefile.in
-+++ kate/kpybrowser/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/kpybrowser/Makefile.in kdeaddons-3.5.5/kate/kpybrowser/Makefile.in
+--- kdeaddons-3.5.5.old/kate/kpybrowser/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/kpybrowser/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -140,6 +140,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44878,6 +45919,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -404,9 +413,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/kpybrowser/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/kpybrowser/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/kpybrowser/Makefile
++#>- $(AUTOMAKE) --gnu kate/kpybrowser/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -416,9 +425,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/kpybrowser/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/kpybrowser/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/kpybrowser/Makefile
++ $(AUTOMAKE) --gnu kate/kpybrowser/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/kpybrowser/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -433,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44890,17 +45955,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -764,7 +773,7 @@
- -rm -f pybrowse_part.moc kpybrowser.moc
+@@ -783,9 +792,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/kpybrowser/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/kpybrowser/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/kpybrowser/Makefile
++ $(AUTOMAKE) --gnu kate/kpybrowser/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/kpybrowser/Makefile.in
- #>+ 2
--KDE_DIST=pybrowse.xpm kpybrowser.h Makefile.in katepybrowse.desktop ui.rc pybrowse_part.h Makefile.am kpybrowser.desktop pybrowsenode.h
-+KDE_DIST=Makefile.in pybrowse_part.h pybrowsenode.h pybrowse.xpm kpybrowser.h katepybrowse.desktop ui.rc Makefile.am kpybrowser.desktop
- #>+ 3
- clean-closures:
---- kate/make/Makefile.in
-+++ kate/make/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/make/Makefile.in kdeaddons-3.5.5/kate/make/Makefile.in
+--- kdeaddons-3.5.5.old/kate/make/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/make/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -44986,6 +46055,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -405,9 +414,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/make/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/make/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/make/Makefile
++#>- $(AUTOMAKE) --gnu kate/make/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/make/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/make/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/make/Makefile
++ $(AUTOMAKE) --gnu kate/make/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/make/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -434,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -44998,8 +46091,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kate/Makefile.in
-+++ kate/Makefile.in
+@@ -775,9 +784,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/make/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/make/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/make/Makefile
++ $(AUTOMAKE) --gnu kate/make/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/make/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kate/Makefile.in kdeaddons-3.5.5/kate/Makefile.in
+--- kdeaddons-3.5.5.old/kate/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/kate/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45085,6 +46191,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -364,9 +373,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/Makefile
++#>- $(AUTOMAKE) --gnu kate/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -376,9 +385,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/Makefile
++ $(AUTOMAKE) --gnu kate/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -393,9 +402,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45097,8 +46227,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kate/modeline/Makefile.in
-+++ kate/modeline/Makefile.in
+@@ -697,9 +706,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/Makefile
++ $(AUTOMAKE) --gnu kate/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kate/modeline/Makefile.in kdeaddons-3.5.5/kate/modeline/Makefile.in
+--- kdeaddons-3.5.5.old/kate/modeline/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/modeline/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45184,6 +46327,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -405,9 +414,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/modeline/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/modeline/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/modeline/Makefile
++#>- $(AUTOMAKE) --gnu kate/modeline/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/modeline/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/modeline/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/modeline/Makefile
++ $(AUTOMAKE) --gnu kate/modeline/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/modeline/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -434,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45196,17 +46363,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -756,7 +765,7 @@
- -rm -f ModelinePlugin.moc
+@@ -775,9 +784,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/modeline/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/modeline/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/modeline/Makefile
++ $(AUTOMAKE) --gnu kate/modeline/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/modeline/Makefile.in
- #>+ 2
--KDE_DIST=ModelinePlugin.h Makefile.in katemodeline.desktop ui.rc Makefile.am
-+KDE_DIST=Makefile.in ModelinePlugin.h katemodeline.desktop ui.rc Makefile.am
- #>+ 3
- clean-closures:
---- kate/openheader/Makefile.in
-+++ kate/openheader/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/openheader/Makefile.in kdeaddons-3.5.5/kate/openheader/Makefile.in
+--- kdeaddons-3.5.5.old/kate/openheader/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/openheader/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -136,6 +136,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45292,6 +46463,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -406,9 +415,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/openheader/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/openheader/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/openheader/Makefile
++#>- $(AUTOMAKE) --gnu kate/openheader/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/openheader/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/openheader/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/openheader/Makefile
++ $(AUTOMAKE) --gnu kate/openheader/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/openheader/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -435,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45304,17 +46499,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -757,7 +766,7 @@
- -rm -f plugin_kateopenheader.moc
+@@ -776,9 +785,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/openheader/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/openheader/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/openheader/Makefile
++ $(AUTOMAKE) --gnu kate/openheader/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/openheader/Makefile.in
- #>+ 2
--KDE_DIST=kateopenheader.desktop Makefile.in plugin_kateopenheader.h ui.rc Makefile.am
-+KDE_DIST=Makefile.in kateopenheader.desktop plugin_kateopenheader.h ui.rc Makefile.am
- #>+ 3
- clean-closures:
---- kate/scripts/Makefile.in
-+++ kate/scripts/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/scripts/Makefile.in kdeaddons-3.5.5/kate/scripts/Makefile.in
+--- kdeaddons-3.5.5.old/kate/scripts/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/scripts/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -102,6 +102,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45400,6 +46599,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -356,9 +365,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/scripts/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/scripts/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/scripts/Makefile
++#>- $(AUTOMAKE) --gnu kate/scripts/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -368,9 +377,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/scripts/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/scripts/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/scripts/Makefile
++ $(AUTOMAKE) --gnu kate/scripts/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/scripts/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -385,9 +394,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45412,17 +46635,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -547,7 +556,7 @@
- .NOEXPORT:
+@@ -562,9 +571,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/scripts/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/scripts/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/scripts/Makefile
++ $(AUTOMAKE) --gnu kate/scripts/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/scripts/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in html-tidy.sh Makefile.am html-tidy.desktop
-+KDE_DIST=Makefile.in html-tidy.desktop html-tidy.sh Makefile.am
- #>+ 2
- docs-am:
---- kate/snippets/Makefile.in
-+++ kate/snippets/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/snippets/Makefile.in kdeaddons-3.5.5/kate/snippets/Makefile.in
+--- kdeaddons-3.5.5.old/kate/snippets/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/snippets/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -148,6 +148,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45508,6 +46735,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -414,9 +423,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/snippets/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/snippets/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/snippets/Makefile
++#>- $(AUTOMAKE) --gnu kate/snippets/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -426,9 +435,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/snippets/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/snippets/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/snippets/Makefile
++ $(AUTOMAKE) --gnu kate/snippets/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/snippets/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -443,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45520,17 +46771,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -774,7 +783,7 @@
- -rm -f plugin_katesnippets.moc csnippet.moc
+@@ -798,9 +807,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/snippets/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/snippets/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/snippets/Makefile
++ $(AUTOMAKE) --gnu kate/snippets/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/snippets/Makefile.in
- #>+ 2
--KDE_DIST=katesnippets.desktop Makefile.in plugin_katesnippets.h plugin_katesnippets.rc CWidgetSnippetsBase.ui Makefile.am
-+KDE_DIST=Makefile.in plugin_katesnippets.h plugin_katesnippets.rc CWidgetSnippetsBase.ui katesnippets.desktop Makefile.am
- #>+ 4
- clean-ui:
---- kate/tabbarextension/Makefile.in
-+++ kate/tabbarextension/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/tabbarextension/Makefile.in kdeaddons-3.5.5/kate/tabbarextension/Makefile.in
+--- kdeaddons-3.5.5.old/kate/tabbarextension/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/tabbarextension/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -137,6 +137,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45616,6 +46871,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -401,9 +410,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/tabbarextension/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/tabbarextension/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/tabbarextension/Makefile
++#>- $(AUTOMAKE) --gnu kate/tabbarextension/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -413,9 +422,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/tabbarextension/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/tabbarextension/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/tabbarextension/Makefile
++ $(AUTOMAKE) --gnu kate/tabbarextension/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/tabbarextension/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -430,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45628,17 +46907,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -752,7 +761,7 @@
- -rm -f plugin_katetabbarextension.moc
+@@ -771,9 +780,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/tabbarextension/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/tabbarextension/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/tabbarextension/Makefile
++ $(AUTOMAKE) --gnu kate/tabbarextension/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/tabbarextension/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in katetabbarextension.desktop ui.rc plugin_katetabbarextension.h Makefile.am
-+KDE_DIST=katetabbarextension.desktop Makefile.in ui.rc plugin_katetabbarextension.h Makefile.am
- #>+ 3
- clean-closures:
---- kate/textfilter/Makefile.in
-+++ kate/textfilter/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/textfilter/Makefile.in kdeaddons-3.5.5/kate/textfilter/Makefile.in
+--- kdeaddons-3.5.5.old/kate/textfilter/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/textfilter/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -136,6 +136,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45724,6 +47007,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -406,9 +415,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/textfilter/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/textfilter/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/textfilter/Makefile
++#>- $(AUTOMAKE) --gnu kate/textfilter/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/textfilter/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/textfilter/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/textfilter/Makefile
++ $(AUTOMAKE) --gnu kate/textfilter/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/textfilter/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -435,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45736,17 +47043,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -757,7 +766,7 @@
- -rm -f plugin_katetextfilter.moc
+@@ -776,9 +785,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/textfilter/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/textfilter/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/textfilter/Makefile
++ $(AUTOMAKE) --gnu kate/textfilter/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/textfilter/Makefile.in
- #>+ 2
--KDE_DIST=katetextfilter.desktop Makefile.in ui.rc Makefile.am plugin_katetextfilter.h
-+KDE_DIST=katetextfilter.desktop Makefile.in plugin_katetextfilter.h ui.rc Makefile.am
- #>+ 3
- clean-closures:
---- kate/xmlcheck/Makefile.in
-+++ kate/xmlcheck/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kate/xmlcheck/Makefile.in kdeaddons-3.5.5/kate/xmlcheck/Makefile.in
+--- kdeaddons-3.5.5.old/kate/xmlcheck/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/xmlcheck/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45832,6 +47143,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -405,9 +414,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/xmlcheck/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/xmlcheck/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/xmlcheck/Makefile
++#>- $(AUTOMAKE) --gnu kate/xmlcheck/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/xmlcheck/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/xmlcheck/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/xmlcheck/Makefile
++ $(AUTOMAKE) --gnu kate/xmlcheck/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/xmlcheck/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -434,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45844,8 +47179,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kate/xmltools/Makefile.in
-+++ kate/xmltools/Makefile.in
+@@ -775,9 +784,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/xmlcheck/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/xmlcheck/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/xmlcheck/Makefile
++ $(AUTOMAKE) --gnu kate/xmlcheck/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/xmlcheck/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kate/xmltools/Makefile.in kdeaddons-3.5.5/kate/xmltools/Makefile.in
+--- kdeaddons-3.5.5.old/kate/xmltools/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kate/xmltools/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -143,6 +143,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -45931,6 +47279,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -422,9 +431,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/xmltools/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/xmltools/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kate/xmltools/Makefile
++#>- $(AUTOMAKE) --gnu kate/xmltools/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -434,9 +443,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/xmltools/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/xmltools/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/xmltools/Makefile
++ $(AUTOMAKE) --gnu kate/xmltools/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/xmltools/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -451,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -45943,17 +47315,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -792,7 +801,7 @@
- -rm -f plugin_katexmltools.moc
+@@ -811,9 +820,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kate/xmltools/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kate/xmltools/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kate/xmltools/Makefile
++ $(AUTOMAKE) --gnu kate/xmltools/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kate/xmltools/Makefile.in
- #>+ 2
--KDE_DIST=plugin_katexmltools.h xhtml1-strict.dtd.xml testcases.xml Makefile.in xhtml1-frameset.dtd.xml xslt-1.0.dtd.xml katexmltools.desktop xhtml1-transitional.dtd.xml html4-loose.dtd.xml html4-strict.dtd.xml language.dtd.xml pseudo_dtd.h kcfg.dtd.xml kde-docbook.dtd.xml ui.rc Makefile.am kpartgui.dtd.xml simplify_dtd.xsl
-+KDE_DIST=plugin_katexmltools.h xhtml1-strict.dtd.xml testcases.xml xhtml1-frameset.dtd.xml Makefile.in xslt-1.0.dtd.xml katexmltools.desktop xhtml1-transitional.dtd.xml html4-loose.dtd.xml pseudo_dtd.h language.dtd.xml html4-strict.dtd.xml kcfg.dtd.xml kde-docbook.dtd.xml ui.rc Makefile.am kpartgui.dtd.xml simplify_dtd.xsl
- #>+ 3
- clean-closures:
---- kfile-plugins/cert/Makefile.in
-+++ kfile-plugins/cert/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kfile-plugins/cert/Makefile.in kdeaddons-3.5.5/kfile-plugins/cert/Makefile.in
+--- kdeaddons-3.5.5.old/kfile-plugins/cert/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kfile-plugins/cert/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46039,6 +47415,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -406,9 +415,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/cert/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/cert/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kfile-plugins/cert/Makefile
++#>- $(AUTOMAKE) --gnu kfile-plugins/cert/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/cert/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/cert/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/cert/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/cert/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/cert/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -435,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46051,8 +47451,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kfile-plugins/desktop/Makefile.in
-+++ kfile-plugins/desktop/Makefile.in
+@@ -756,9 +765,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/cert/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/cert/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/cert/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/cert/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/cert/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kfile-plugins/desktop/Makefile.in kdeaddons-3.5.5/kfile-plugins/desktop/Makefile.in
+--- kdeaddons-3.5.5.old/kfile-plugins/desktop/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kfile-plugins/desktop/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46138,6 +47551,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -406,9 +415,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/desktop/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/desktop/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kfile-plugins/desktop/Makefile
++#>- $(AUTOMAKE) --gnu kfile-plugins/desktop/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/desktop/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/desktop/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/desktop/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/desktop/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/desktop/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -435,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46150,8 +47587,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kfile-plugins/folder/Makefile.in
-+++ kfile-plugins/folder/Makefile.in
+@@ -756,9 +765,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/desktop/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/desktop/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/desktop/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/desktop/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/desktop/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kfile-plugins/folder/Makefile.in kdeaddons-3.5.5/kfile-plugins/folder/Makefile.in
+--- kdeaddons-3.5.5.old/kfile-plugins/folder/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kfile-plugins/folder/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46237,6 +47687,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -404,9 +413,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/folder/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/folder/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kfile-plugins/folder/Makefile
++#>- $(AUTOMAKE) --gnu kfile-plugins/folder/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -416,9 +425,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/folder/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/folder/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/folder/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/folder/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/folder/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -433,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46249,8 +47723,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kfile-plugins/html/Makefile.in
-+++ kfile-plugins/html/Makefile.in
+@@ -754,9 +763,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/folder/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/folder/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/folder/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/folder/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/folder/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kfile-plugins/html/Makefile.in kdeaddons-3.5.5/kfile-plugins/html/Makefile.in
+--- kdeaddons-3.5.5.old/kfile-plugins/html/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kfile-plugins/html/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46336,6 +47823,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -406,9 +415,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/html/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/html/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kfile-plugins/html/Makefile
++#>- $(AUTOMAKE) --gnu kfile-plugins/html/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/html/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/html/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/html/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/html/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/html/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -435,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46348,8 +47859,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kfile-plugins/lnk/Makefile.in
-+++ kfile-plugins/lnk/Makefile.in
+@@ -756,9 +765,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/html/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/html/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/html/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/html/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/html/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kfile-plugins/lnk/Makefile.in kdeaddons-3.5.5/kfile-plugins/lnk/Makefile.in
+--- kdeaddons-3.5.5.old/kfile-plugins/lnk/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kfile-plugins/lnk/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -153,6 +153,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46435,6 +47959,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -427,9 +436,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/lnk/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/lnk/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kfile-plugins/lnk/Makefile
++#>- $(AUTOMAKE) --gnu kfile-plugins/lnk/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -439,9 +448,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/lnk/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/lnk/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/lnk/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/lnk/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/lnk/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -456,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46447,8 +47995,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kfile-plugins/Makefile.in
-+++ kfile-plugins/Makefile.in
+@@ -858,9 +867,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/lnk/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/lnk/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/lnk/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/lnk/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/lnk/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kfile-plugins/Makefile.in kdeaddons-3.5.5/kfile-plugins/Makefile.in
+--- kdeaddons-3.5.5.old/kfile-plugins/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kfile-plugins/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46534,6 +48095,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -362,9 +371,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kfile-plugins/Makefile
++#>- $(AUTOMAKE) --gnu kfile-plugins/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -374,9 +383,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -391,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46546,8 +48131,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kfile-plugins/mhtml/Makefile.in
-+++ kfile-plugins/mhtml/Makefile.in
+@@ -695,9 +704,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kfile-plugins/mhtml/Makefile.in kdeaddons-3.5.5/kfile-plugins/mhtml/Makefile.in
+--- kdeaddons-3.5.5.old/kfile-plugins/mhtml/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kfile-plugins/mhtml/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46633,6 +48231,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -404,9 +413,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/mhtml/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/mhtml/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kfile-plugins/mhtml/Makefile
++#>- $(AUTOMAKE) --gnu kfile-plugins/mhtml/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -416,9 +425,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/mhtml/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/mhtml/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/mhtml/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/mhtml/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/mhtml/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -433,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46645,8 +48267,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kfile-plugins/txt/Makefile.in
-+++ kfile-plugins/txt/Makefile.in
+@@ -754,9 +763,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/mhtml/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/mhtml/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/mhtml/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/mhtml/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/mhtml/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kfile-plugins/txt/Makefile.in kdeaddons-3.5.5/kfile-plugins/txt/Makefile.in
+--- kdeaddons-3.5.5.old/kfile-plugins/txt/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kfile-plugins/txt/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46732,6 +48367,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -404,9 +413,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/txt/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/txt/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kfile-plugins/txt/Makefile
++#>- $(AUTOMAKE) --gnu kfile-plugins/txt/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -416,9 +425,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/txt/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/txt/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/txt/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/txt/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/txt/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -433,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46744,8 +48403,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kicker-applets/kbinaryclock/Makefile.in
-+++ kicker-applets/kbinaryclock/Makefile.in
+@@ -754,9 +763,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kfile-plugins/txt/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kfile-plugins/txt/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kfile-plugins/txt/Makefile
++ $(AUTOMAKE) --gnu kfile-plugins/txt/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kfile-plugins/txt/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kicker-applets/kbinaryclock/Makefile.in kdeaddons-3.5.5/kicker-applets/kbinaryclock/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/kbinaryclock/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/kbinaryclock/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -143,6 +143,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46831,6 +48503,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -409,9 +418,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/kbinaryclock/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/kbinaryclock/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/kbinaryclock/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/kbinaryclock/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -421,9 +430,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/kbinaryclock/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/kbinaryclock/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/kbinaryclock/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/kbinaryclock/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/kbinaryclock/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -438,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46843,8 +48539,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kicker-applets/kolourpicker/Makefile.in
-+++ kicker-applets/kolourpicker/Makefile.in
+@@ -790,9 +799,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/kbinaryclock/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/kbinaryclock/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/kbinaryclock/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/kbinaryclock/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/kbinaryclock/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kicker-applets/kolourpicker/Makefile.in kdeaddons-3.5.5/kicker-applets/kolourpicker/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/kolourpicker/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/kolourpicker/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -46930,6 +48639,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -401,9 +410,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/kolourpicker/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/kolourpicker/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/kolourpicker/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/kolourpicker/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -413,9 +422,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/kolourpicker/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/kolourpicker/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/kolourpicker/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/kolourpicker/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/kolourpicker/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -430,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -46942,8 +48675,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kicker-applets/ktimemon/Makefile.in
-+++ kicker-applets/ktimemon/Makefile.in
+@@ -751,9 +760,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/kolourpicker/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/kolourpicker/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/kolourpicker/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/kolourpicker/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/kolourpicker/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kicker-applets/ktimemon/Makefile.in kdeaddons-3.5.5/kicker-applets/ktimemon/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/ktimemon/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/ktimemon/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -142,6 +142,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -47029,6 +48775,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -406,9 +415,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/ktimemon/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/ktimemon/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/ktimemon/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/ktimemon/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/ktimemon/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/ktimemon/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/ktimemon/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/ktimemon/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/ktimemon/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -435,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47041,47 +48811,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -749,7 +758,7 @@
- -rm -f timemon.moc confdlg.moc
+@@ -785,9 +794,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/ktimemon/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/ktimemon/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/ktimemon/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/ktimemon/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/ktimemon/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in cr16-app-ktimemon.png cr32-app-ktimemon.png ktimemon.desktop lo32-app-ktimemon.png configure.in.in Makefile.am lo16-app-ktimemon.png
-+KDE_DIST=Makefile.in cr16-app-ktimemon.png cr32-app-ktimemon.png lo32-app-ktimemon.png ktimemon.desktop configure.in.in Makefile.am lo16-app-ktimemon.png
- #>+ 3
- clean-closures:
-@@ -760,20 +769,20 @@
-
- #>+ 16
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/lo32-app-ktimemon.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/ktimemon.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/lo16-app-ktimemon.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/ktimemon.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-ktimemon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktimemon.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-ktimemon.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimemon.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-ktimemon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktimemon.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/lo16-app-ktimemon.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/ktimemon.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/lo32-app-ktimemon.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/ktimemon.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/ktimemon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/ktimemon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktimemon.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktimemon.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktimemon.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/ktimemon.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/ktimemon.png
-
- #>+ 15
- force-reedit:
---- kicker-applets/Makefile.in
-+++ kicker-applets/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kicker-applets/Makefile.in kdeaddons-3.5.5/kicker-applets/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -47158,14 +48902,7 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
renamedlgplugins_SUBDIR_included_FALSE = @renamedlgplugins_SUBDIR_included_FALSE@
-@@ -348,13 +357,13 @@
- xdg_menudir = @xdg_menudir@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. mediacontrol ktimemon kolourpicker math kbinaryclock
-+SUBDIRS =. math kolourpicker kbinaryclock mediacontrol ktimemon
- #>- all: all-recursive
- #>+ 1
+@@ -354,7 +363,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -47174,6 +48911,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -363,9 +372,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -375,9 +384,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -392,9 +401,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47186,8 +48947,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kicker-applets/math/Makefile.in
-+++ kicker-applets/math/Makefile.in
+@@ -696,9 +705,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kicker-applets/math/Makefile.in kdeaddons-3.5.5/kicker-applets/math/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/math/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/math/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -141,6 +141,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -47273,6 +49047,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -404,9 +413,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/math/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/math/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/math/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/math/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -416,9 +425,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/math/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/math/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/math/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/math/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/math/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -433,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47285,8 +49083,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- kicker-applets/mediacontrol/Makefile.in
-+++ kicker-applets/mediacontrol/Makefile.in
+@@ -755,9 +764,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/math/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/math/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/math/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/math/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/math/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kicker-applets/mediacontrol/Makefile.in kdeaddons-3.5.5/kicker-applets/mediacontrol/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/mediacontrol/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/mediacontrol/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -159,6 +159,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -47372,6 +49183,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -444,9 +453,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/mediacontrol/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -456,9 +465,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -473,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47384,114 +49219,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -886,18 +895,18 @@
+@@ -996,9 +1005,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/Makefile.in
- #>+ 3
--jukInterface.moc: $(srcdir)/jukInterface.h
-- $(MOC) $(srcdir)/jukInterface.h -o jukInterface.moc
-+configfrontend.moc: $(srcdir)/configfrontend.h
-+ $(MOC) $(srcdir)/configfrontend.h -o configfrontend.moc
-
- #>+ 2
--mocs: jukInterface.moc
-+mocs: configfrontend.moc
-
- #>+ 3
--configfrontend.moc: $(srcdir)/configfrontend.h
-- $(MOC) $(srcdir)/configfrontend.h -o configfrontend.moc
-+jukInterface.moc: $(srcdir)/jukInterface.h
-+ $(MOC) $(srcdir)/jukInterface.h -o jukInterface.moc
-
- #>+ 2
--mocs: configfrontend.moc
-+mocs: jukInterface.moc
-
- #>+ 3
- mediacontrolconfig.moc: $(srcdir)/mediacontrolconfig.h
-@@ -914,13 +923,6 @@
- mocs: mediacontrol.moc
-
- #>+ 3
--playerInterface.moc: $(srcdir)/playerInterface.h
-- $(MOC) $(srcdir)/playerInterface.h -o playerInterface.moc
--
--#>+ 2
--mocs: playerInterface.moc
--
--#>+ 3
- amarokInterface.moc: $(srcdir)/amarokInterface.h
- $(MOC) $(srcdir)/amarokInterface.h -o amarokInterface.moc
-
-@@ -935,6 +937,13 @@
- mocs: mcslider.moc
-
- #>+ 3
-+playerInterface.moc: $(srcdir)/playerInterface.h
-+ $(MOC) $(srcdir)/playerInterface.h -o playerInterface.moc
-+
-+#>+ 2
-+mocs: playerInterface.moc
-+
-+#>+ 3
- xmmsInterface.moc: $(srcdir)/xmmsInterface.h
- $(MOC) $(srcdir)/xmmsInterface.h -o xmmsInterface.moc
-
-@@ -949,25 +958,25 @@
- mocs: noatunInterface.moc
-
- #>+ 3
--mpdInterface.moc: $(srcdir)/mpdInterface.h
-- $(MOC) $(srcdir)/mpdInterface.h -o mpdInterface.moc
-+kscdInterface.moc: $(srcdir)/kscdInterface.h
-+ $(MOC) $(srcdir)/kscdInterface.h -o kscdInterface.moc
-
- #>+ 2
--mocs: mpdInterface.moc
-+mocs: kscdInterface.moc
-
- #>+ 3
--kscdInterface.moc: $(srcdir)/kscdInterface.h
-- $(MOC) $(srcdir)/kscdInterface.h -o kscdInterface.moc
-+mpdInterface.moc: $(srcdir)/mpdInterface.h
-+ $(MOC) $(srcdir)/mpdInterface.h -o mpdInterface.moc
-
- #>+ 2
--mocs: kscdInterface.moc
-+mocs: mpdInterface.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f jukInterface.moc configfrontend.moc mediacontrolconfig.moc mediacontrol.moc playerInterface.moc amarokInterface.moc mcslider.moc xmmsInterface.moc noatunInterface.moc mpdInterface.moc kscdInterface.moc
-+ -rm -f configfrontend.moc jukInterface.moc mediacontrolconfig.moc mediacontrol.moc amarokInterface.moc mcslider.moc playerInterface.moc xmmsInterface.moc noatunInterface.moc kscdInterface.moc mpdInterface.moc
-
- #>+ 2
--KDE_DIST=mediacontrol.h mcslider.h Makefile.in mediacontrol.desktop amarokInterface.h playerInterface.h jukInterface.h configfrontend.h noatunInterface.h mpdInterface.h kscdInterface.h mediacontrolconfig.h mediacontrolconfigwidget.ui configure.in.in Makefile.am xmmsInterface.h mediacontroliface.h
-+KDE_DIST=mediacontrol.h mcslider.h amarokInterface.h mediacontrol.desktop Makefile.in playerInterface.h jukInterface.h configfrontend.h noatunInterface.h mpdInterface.h kscdInterface.h mediacontrolconfig.h mediacontrolconfigwidget.ui configure.in.in Makefile.am xmmsInterface.h mediacontroliface.h
-
- #>+ 4
- clean-idl:
-@@ -1025,7 +1034,7 @@
-
-
- #>+ 11
--mediacontrol_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mcslider.cpp $(srcdir)/mediacontrol.cpp $(srcdir)/playerInterface.cpp $(srcdir)/configfrontend.cpp $(srcdir)/mediacontrolconfig.cpp $(srcdir)/noatunInterface.cpp $(srcdir)/xmmsInterface.cpp $(srcdir)/mpdInterface.cpp $(srcdir)/jukInterface.cpp $(srcdir)/amarokInterface.cpp $(srcdir)/kscdInterface.cpp mediacontroliface_skel.cpp mediacontrolconfigwidget.cpp configfrontend.moc jukInterface.moc mediacontrolconfig.moc mediacontrolconfigwidget.moc mediacontrol.moc playerInterface.moc amarokInterface.moc mcslider.moc xmmsInterface.moc noatunInterface.moc kscdInterface.moc mpdInterface.moc
-+mediacontrol_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mcslider.cpp $(srcdir)/mediacontrol.cpp $(srcdir)/playerInterface.cpp $(srcdir)/configfrontend.cpp $(srcdir)/mediacontrolconfig.cpp $(srcdir)/noatunInterface.cpp $(srcdir)/xmmsInterface.cpp $(srcdir)/mpdInterface.cpp $(srcdir)/jukInterface.cpp $(srcdir)/amarokInterface.cpp $(srcdir)/kscdInterface.cpp mediacontroliface_skel.cpp mediacontrolconfigwidget.cpp jukInterface.moc configfrontend.moc mediacontrolconfig.moc mediacontrolconfigwidget.moc mediacontrol.moc amarokInterface.moc mcslider.moc playerInterface.moc xmmsInterface.moc noatunInterface.moc mpdInterface.moc kscdInterface.moc
- @echo 'creating mediacontrol_panelapplet_la.all_cpp.cpp ...'; \
- rm -f mediacontrol_panelapplet_la.all_cpp.files mediacontrol_panelapplet_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> mediacontrol_panelapplet_la.all_cpp.final; \
-@@ -1091,8 +1100,8 @@
- mediacontrolconfigwidget.cpp: mediacontrolconfigwidget.h
- kscdInterface.lo: kscdInterface.moc
- $(srcdir)/mpdInterface.cpp: mediacontrolconfigwidget.h mediacontrolconfigwidget.h
--configfrontend.lo: configfrontend.moc
- jukInterface.lo: jukInterface.moc
-+configfrontend.lo: configfrontend.moc
- amarokInterface.o: amarokInterface.moc
- kscdInterface.o: kscdInterface.moc
- $(srcdir)/configfrontend.cpp: mediacontrolconfigwidget.h mediacontrolconfigwidget.h
---- kicker-applets/mediacontrol/pics/blueish/Makefile.in
-+++ kicker-applets/mediacontrol/pics/blueish/Makefile.in
+diff -ur kdeaddons-3.5.5.old/kicker-applets/mediacontrol/pics/blueish/Makefile.in kdeaddons-3.5.5/kicker-applets/mediacontrol/pics/blueish/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/mediacontrol/pics/blueish/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/mediacontrol/pics/blueish/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -102,6 +102,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -47577,6 +49319,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -359,9 +368,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/blueish/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/blueish/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/blueish/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/blueish/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -371,9 +380,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/blueish/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/blueish/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/blueish/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/blueish/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/pics/blueish/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -388,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47589,8 +49355,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kicker-applets/mediacontrol/pics/default/Makefile.in
-+++ kicker-applets/mediacontrol/pics/default/Makefile.in
+@@ -564,9 +573,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/blueish/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/blueish/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/blueish/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/blueish/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/pics/blueish/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kicker-applets/mediacontrol/pics/default/Makefile.in kdeaddons-3.5.5/kicker-applets/mediacontrol/pics/default/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/mediacontrol/pics/default/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/mediacontrol/pics/default/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -102,6 +102,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -47676,6 +49455,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -359,9 +368,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/default/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/default/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/default/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/default/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -371,9 +380,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/default/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/default/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/default/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/default/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/pics/default/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -388,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47688,8 +49491,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kicker-applets/mediacontrol/pics/fulldecent/Makefile.in
-+++ kicker-applets/mediacontrol/pics/fulldecent/Makefile.in
+@@ -564,9 +573,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/default/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/default/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/default/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/default/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/pics/default/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kicker-applets/mediacontrol/pics/fulldecent/Makefile.in kdeaddons-3.5.5/kicker-applets/mediacontrol/pics/fulldecent/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/mediacontrol/pics/fulldecent/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/mediacontrol/pics/fulldecent/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -102,6 +102,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -47775,6 +49591,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -359,9 +368,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/fulldecent/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/fulldecent/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/fulldecent/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/fulldecent/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -371,9 +380,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/fulldecent/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/fulldecent/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/fulldecent/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/fulldecent/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/pics/fulldecent/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -388,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47787,8 +49627,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- kicker-applets/mediacontrol/pics/Makefile.in
-+++ kicker-applets/mediacontrol/pics/Makefile.in
+@@ -564,9 +573,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/fulldecent/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/fulldecent/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/fulldecent/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/fulldecent/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/pics/fulldecent/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/kicker-applets/mediacontrol/pics/Makefile.in kdeaddons-3.5.5/kicker-applets/mediacontrol/pics/Makefile.in
+--- kdeaddons-3.5.5.old/kicker-applets/mediacontrol/pics/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/kicker-applets/mediacontrol/pics/Makefile.in 2006-10-10 01:35:00.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -47874,6 +49727,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -363,9 +372,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/Makefile
++#>- $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -375,9 +384,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -392,9 +401,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47886,8 +49763,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- knewsticker-scripts/Makefile.in
-+++ knewsticker-scripts/Makefile.in
+@@ -696,9 +705,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign kicker-applets/mediacontrol/pics/Makefile
++ $(AUTOMAKE) --gnu kicker-applets/mediacontrol/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit kicker-applets/mediacontrol/pics/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/knewsticker-scripts/Makefile.in kdeaddons-3.5.5/knewsticker-scripts/Makefile.in
+--- kdeaddons-3.5.5.old/knewsticker-scripts/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/knewsticker-scripts/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -102,6 +102,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -47973,6 +49863,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -362,9 +371,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign knewsticker-scripts/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu knewsticker-scripts/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign knewsticker-scripts/Makefile
++#>- $(AUTOMAKE) --gnu knewsticker-scripts/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -374,9 +383,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign knewsticker-scripts/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu knewsticker-scripts/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign knewsticker-scripts/Makefile
++ $(AUTOMAKE) --gnu knewsticker-scripts/Makefile
+ cd $(top_srcdir) && perl admin/am_edit knewsticker-scripts/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -391,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -47985,17 +49899,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -552,7 +561,7 @@
- .NOEXPORT:
+@@ -567,9 +576,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign knewsticker-scripts/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu knewsticker-scripts/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign knewsticker-scripts/Makefile
++ $(AUTOMAKE) --gnu knewsticker-scripts/Makefile
+ cd $(top_srcdir) && perl admin/am_edit knewsticker-scripts/Makefile.in
- #>+ 2
--KDE_DIST=sportscores.py newsrss.pl Makefile.in stock.pl kataribe.pl fyensget.py bbc.pl Generic.Newsticker.Error Readme.stock Readme.newsrss Readme.ErrorHandling Makefile.am README.kataribe GENERAL
-+KDE_DIST=sportscores.py newsrss.pl Makefile.in kataribe.pl stock.pl fyensget.py bbc.pl Readme.newsrss Readme.stock Generic.Newsticker.Error Makefile.am Readme.ErrorHandling README.kataribe GENERAL
- #>+ 2
- docs-am:
---- konq-plugins/akregator/Makefile.in
-+++ konq-plugins/akregator/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/akregator/Makefile.in kdeaddons-3.5.5/konq-plugins/akregator/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/akregator/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/akregator/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -157,6 +157,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -48081,6 +49999,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -431,9 +440,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/akregator/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/akregator/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/akregator/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/akregator/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -443,9 +452,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/akregator/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/akregator/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/akregator/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/akregator/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/akregator/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -460,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48093,46 +50035,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -800,18 +809,18 @@
+@@ -846,9 +855,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/akregator/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/akregator/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/akregator/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/akregator/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/akregator/Makefile.in
- #>+ 3
--konqfeedicon.moc: $(srcdir)/konqfeedicon.h
-- $(MOC) $(srcdir)/konqfeedicon.h -o konqfeedicon.moc
-+akregatorplugin.moc: $(srcdir)/akregatorplugin.h
-+ $(MOC) $(srcdir)/akregatorplugin.h -o akregatorplugin.moc
-
- #>+ 2
--mocs: konqfeedicon.moc
-+mocs: akregatorplugin.moc
-
- #>+ 3
--akregatorplugin.moc: $(srcdir)/akregatorplugin.h
-- $(MOC) $(srcdir)/akregatorplugin.h -o akregatorplugin.moc
-+konqfeedicon.moc: $(srcdir)/konqfeedicon.h
-+ $(MOC) $(srcdir)/konqfeedicon.h -o konqfeedicon.moc
-
- #>+ 2
--mocs: akregatorplugin.moc
-+mocs: konqfeedicon.moc
-
- #>+ 8
- libakregatorkonqplugin.la.closure: $(libakregatorkonqplugin_la_OBJECTS) $(libakregatorkonqplugin_la_DEPENDENCIES)
-@@ -824,10 +833,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f konqfeedicon.moc akregatorplugin.moc
-+ -rm -f akregatorplugin.moc konqfeedicon.moc
-
- #>+ 2
--KDE_DIST=akregator_konqplugin.desktop akregatorplugin.h Makefile.in pluginbase.h feeddetector.h rss.png akregator_konqfeedicon.rc Makefile.am akregator_konqfeedicon.desktop konqfeedicon.h rss.svgz
-+KDE_DIST=akregatorplugin.h akregator_konqplugin.desktop Makefile.in pluginbase.h feeddetector.h rss.png akregator_konqfeedicon.rc Makefile.am akregator_konqfeedicon.desktop konqfeedicon.h rss.svgz
-
- #>+ 3
- clean-closures:
---- konq-plugins/arkplugin/Makefile.in
-+++ konq-plugins/arkplugin/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/arkplugin/Makefile.in kdeaddons-3.5.5/konq-plugins/arkplugin/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/arkplugin/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/arkplugin/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -48218,6 +50135,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -400,9 +409,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/arkplugin/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/arkplugin/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/arkplugin/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/arkplugin/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -412,9 +421,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/arkplugin/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/arkplugin/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/arkplugin/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/arkplugin/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/arkplugin/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -429,9 +438,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48230,17 +50171,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -750,7 +759,7 @@
- -rm -f arkplugin.moc
+@@ -769,9 +778,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/arkplugin/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/arkplugin/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/arkplugin/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/arkplugin/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/arkplugin/Makefile.in
- #>+ 2
--KDE_DIST=ark_plugin.desktop Makefile.in arkplugin.h Makefile.am arkplugin.desktop
-+KDE_DIST=ark_plugin.desktop arkplugin.h Makefile.in Makefile.am arkplugin.desktop
- #>+ 3
- clean-closures:
---- konq-plugins/autorefresh/Makefile.in
-+++ konq-plugins/autorefresh/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/autorefresh/Makefile.in kdeaddons-3.5.5/konq-plugins/autorefresh/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/autorefresh/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/autorefresh/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -48326,6 +50271,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -397,9 +406,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/autorefresh/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/autorefresh/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/autorefresh/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/autorefresh/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -409,9 +418,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/autorefresh/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/autorefresh/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/autorefresh/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/autorefresh/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/autorefresh/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -426,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48338,8 +50307,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- konq-plugins/babelfish/Makefile.in
-+++ konq-plugins/babelfish/Makefile.in
+@@ -761,9 +770,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/autorefresh/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/autorefresh/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/autorefresh/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/autorefresh/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/autorefresh/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/babelfish/Makefile.in kdeaddons-3.5.5/konq-plugins/babelfish/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/babelfish/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/babelfish/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -137,6 +137,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -48425,6 +50407,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -404,9 +413,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/babelfish/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/babelfish/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/babelfish/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/babelfish/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -416,9 +425,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/babelfish/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/babelfish/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/babelfish/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/babelfish/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/babelfish/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -433,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48437,26 +50443,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -773,14 +782,14 @@
+@@ -792,9 +801,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/babelfish/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/babelfish/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/babelfish/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/babelfish/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/babelfish/Makefile.in
- #>+ 10
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/cr22-action-babelfish.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/babelfish.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
- $(INSTALL_DATA) $(srcdir)/cr16-action-babelfish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/babelfish.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-babelfish.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/babelfish.png
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/babelfish.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/babelfish.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/babelfish.png
-
- #>+ 15
- force-reedit:
---- konq-plugins/crashes/Makefile.in
-+++ konq-plugins/crashes/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/crashes/Makefile.in kdeaddons-3.5.5/konq-plugins/crashes/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/crashes/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/crashes/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -48542,6 +50543,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -396,9 +405,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/crashes/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/crashes/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/crashes/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/crashes/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -408,9 +417,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/crashes/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/crashes/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/crashes/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/crashes/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/crashes/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -425,9 +434,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48554,8 +50579,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- konq-plugins/dirfilter/Makefile.in
-+++ konq-plugins/dirfilter/Makefile.in
+@@ -746,9 +755,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/crashes/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/crashes/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/crashes/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/crashes/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/crashes/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/dirfilter/Makefile.in kdeaddons-3.5.5/konq-plugins/dirfilter/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/dirfilter/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/dirfilter/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -48641,6 +50679,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -398,9 +407,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/dirfilter/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/dirfilter/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/dirfilter/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/dirfilter/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -410,9 +419,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/dirfilter/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/dirfilter/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/dirfilter/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/dirfilter/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/dirfilter/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -427,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48653,8 +50715,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- konq-plugins/domtreeviewer/Makefile.in
-+++ konq-plugins/domtreeviewer/Makefile.in
+@@ -768,9 +777,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/dirfilter/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/dirfilter/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/dirfilter/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/dirfilter/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/dirfilter/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/domtreeviewer/Makefile.in kdeaddons-3.5.5/konq-plugins/domtreeviewer/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/domtreeviewer/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/domtreeviewer/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -145,6 +145,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -48740,6 +50815,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -440,9 +449,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/domtreeviewer/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/domtreeviewer/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/domtreeviewer/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/domtreeviewer/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -452,9 +461,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/domtreeviewer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/domtreeviewer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/domtreeviewer/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/domtreeviewer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/domtreeviewer/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -469,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48752,69 +50851,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -806,18 +815,18 @@
- mocs: domtreeview.moc
+@@ -870,9 +879,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/domtreeviewer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/domtreeviewer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/domtreeviewer/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/domtreeviewer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/domtreeviewer/Makefile.in
- #>+ 3
--signalreceiver.moc: $(srcdir)/signalreceiver.h
-- $(MOC) $(srcdir)/signalreceiver.h -o signalreceiver.moc
-+plugin_domtreeviewer.moc: $(srcdir)/plugin_domtreeviewer.h
-+ $(MOC) $(srcdir)/plugin_domtreeviewer.h -o plugin_domtreeviewer.moc
- #>+ 2
--mocs: signalreceiver.moc
-+mocs: plugin_domtreeviewer.moc
-
- #>+ 3
--plugin_domtreeviewer.moc: $(srcdir)/plugin_domtreeviewer.h
-- $(MOC) $(srcdir)/plugin_domtreeviewer.h -o plugin_domtreeviewer.moc
-+signalreceiver.moc: $(srcdir)/signalreceiver.h
-+ $(MOC) $(srcdir)/signalreceiver.h -o signalreceiver.moc
-
- #>+ 2
--mocs: plugin_domtreeviewer.moc
-+mocs: signalreceiver.moc
-
- #>+ 3
- domtreewindow.moc: $(srcdir)/domtreewindow.h
-@@ -828,7 +837,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f domtreecommands.moc domtreeview.moc signalreceiver.moc plugin_domtreeviewer.moc domtreewindow.moc
-+ -rm -f domtreecommands.moc domtreeview.moc plugin_domtreeviewer.moc signalreceiver.moc domtreewindow.moc
-
- #>+ 2
- KDE_DIST=plugin_domtreeviewer.desktop domtreewindow.h Makefile.in plugin_domtreeviewer.rc attributeeditdialog.ui elementeditdialog.ui cr16-action-domtreeviewer.png messagedialog.ui domlistviewitem.h domtreeview.h messagedialog.ui.h plugin_domtreeviewer.h domtreecommands.h signalreceiver.h texteditdialog.ui domtreeviewerui.rc domtreeviewbase.ui Makefile.am cr22-action-domtreeviewer.png
-@@ -851,14 +860,14 @@
-
- #>+ 10
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/cr22-action-domtreeviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/domtreeviewer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
- $(INSTALL_DATA) $(srcdir)/cr16-action-domtreeviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/domtreeviewer.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-domtreeviewer.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/domtreeviewer.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/domtreeviewer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/domtreeviewer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/domtreeviewer.png
-
- #>+ 15
- force-reedit:
-@@ -899,7 +908,7 @@
-
-
- #>+ 11
--libdomtreeviewerplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/plugin_domtreeviewer.cpp $(srcdir)/domtreeview.cpp $(srcdir)/domlistviewitem.cpp $(srcdir)/domtreewindow.cpp $(srcdir)/domtreecommands.cpp $(srcdir)/signalreceiver.cpp domtreeviewbase.cpp attributeeditdialog.cpp elementeditdialog.cpp texteditdialog.cpp messagedialog.cpp domtreecommands.moc plugin_domtreeviewer.moc signalreceiver.moc domtreewindow.moc elementeditdialog.moc domtreeviewbase.moc texteditdialog.moc domtreeview.moc attributeeditdialog.moc messagedialog.moc
-+libdomtreeviewerplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/plugin_domtreeviewer.cpp $(srcdir)/domtreeview.cpp $(srcdir)/domlistviewitem.cpp $(srcdir)/domtreewindow.cpp $(srcdir)/domtreecommands.cpp $(srcdir)/signalreceiver.cpp domtreeviewbase.cpp attributeeditdialog.cpp elementeditdialog.cpp texteditdialog.cpp messagedialog.cpp domtreecommands.moc signalreceiver.moc plugin_domtreeviewer.moc domtreewindow.moc elementeditdialog.moc domtreeviewbase.moc texteditdialog.moc domtreeview.moc attributeeditdialog.moc messagedialog.moc
- @echo 'creating libdomtreeviewerplugin_la.all_cpp.cpp ...'; \
- rm -f libdomtreeviewerplugin_la.all_cpp.files libdomtreeviewerplugin_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libdomtreeviewerplugin_la.all_cpp.final; \
---- konq-plugins/fsview/Makefile.in
-+++ konq-plugins/fsview/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/fsview/Makefile.in kdeaddons-3.5.5/konq-plugins/fsview/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/fsview/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/fsview/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -164,6 +164,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -48900,6 +50951,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -444,9 +453,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/fsview/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/fsview/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/fsview/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/fsview/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -456,9 +465,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/fsview/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/fsview/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/fsview/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/fsview/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/fsview/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -473,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -48912,8 +50987,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- konq-plugins/imagerotation/Makefile.in
-+++ konq-plugins/imagerotation/Makefile.in
+@@ -914,9 +923,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/fsview/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/fsview/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/fsview/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/fsview/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/fsview/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/imagerotation/Makefile.in kdeaddons-3.5.5/konq-plugins/imagerotation/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/imagerotation/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/imagerotation/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -107,6 +107,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -48999,6 +51087,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -364,9 +373,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/imagerotation/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/imagerotation/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/imagerotation/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/imagerotation/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -376,9 +385,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/imagerotation/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/imagerotation/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/imagerotation/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/imagerotation/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/imagerotation/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -393,9 +402,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49011,8 +51123,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
---- konq-plugins/khtmlsettingsplugin/Makefile.in
-+++ konq-plugins/khtmlsettingsplugin/Makefile.in
+@@ -610,9 +619,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/imagerotation/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/imagerotation/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/imagerotation/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/imagerotation/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/imagerotation/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/khtmlsettingsplugin/Makefile.in kdeaddons-3.5.5/konq-plugins/khtmlsettingsplugin/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/khtmlsettingsplugin/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/khtmlsettingsplugin/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -136,6 +136,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -49098,6 +51223,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -397,9 +406,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/khtmlsettingsplugin/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/khtmlsettingsplugin/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/khtmlsettingsplugin/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/khtmlsettingsplugin/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -409,9 +418,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/khtmlsettingsplugin/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/khtmlsettingsplugin/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/khtmlsettingsplugin/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/khtmlsettingsplugin/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/khtmlsettingsplugin/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -426,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49110,8 +51259,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- konq-plugins/kimgalleryplugin/Makefile.in
-+++ konq-plugins/kimgalleryplugin/Makefile.in
+@@ -747,9 +756,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/khtmlsettingsplugin/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/khtmlsettingsplugin/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/khtmlsettingsplugin/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/khtmlsettingsplugin/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/khtmlsettingsplugin/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/kimgalleryplugin/Makefile.in kdeaddons-3.5.5/konq-plugins/kimgalleryplugin/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/kimgalleryplugin/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/kimgalleryplugin/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -49197,6 +51359,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -402,9 +411,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/kimgalleryplugin/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/kimgalleryplugin/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/kimgalleryplugin/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/kimgalleryplugin/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -414,9 +423,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/kimgalleryplugin/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/kimgalleryplugin/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/kimgalleryplugin/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/kimgalleryplugin/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/kimgalleryplugin/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -431,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49209,8 +51395,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- konq-plugins/kuick/kcmkuick/Makefile.in
-+++ konq-plugins/kuick/kcmkuick/Makefile.in
+@@ -794,9 +803,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/kimgalleryplugin/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/kimgalleryplugin/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/kimgalleryplugin/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/kimgalleryplugin/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/kimgalleryplugin/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/kuick/kcmkuick/Makefile.in kdeaddons-3.5.5/konq-plugins/kuick/kcmkuick/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/kuick/kcmkuick/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/kuick/kcmkuick/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -141,6 +141,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -49296,6 +51495,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -407,9 +416,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/kuick/kcmkuick/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/kuick/kcmkuick/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/kuick/kcmkuick/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/kuick/kcmkuick/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -419,9 +428,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/kuick/kcmkuick/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/kuick/kcmkuick/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/kuick/kcmkuick/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/kuick/kcmkuick/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/kuick/kcmkuick/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -436,9 +445,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49308,8 +51531,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- konq-plugins/kuick/Makefile.in
-+++ konq-plugins/kuick/Makefile.in
+@@ -762,9 +771,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/kuick/kcmkuick/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/kuick/kcmkuick/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/kuick/kcmkuick/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/kuick/kcmkuick/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/kuick/kcmkuick/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/kuick/Makefile.in kdeaddons-3.5.5/konq-plugins/kuick/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/kuick/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/kuick/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -158,6 +158,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -49395,6 +51631,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -428,9 +437,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/kuick/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/kuick/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/kuick/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/kuick/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -440,9 +449,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/kuick/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/kuick/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/kuick/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/kuick/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/kuick/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49407,55 +51667,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -885,18 +894,18 @@
- mocs: kuick_plugin.moc
+@@ -929,9 +938,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/kuick/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/kuick/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/kuick/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/kuick/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/kuick/Makefile.in
- #>+ 3
--kmetamenu.moc: $(srcdir)/kmetamenu.h
-- $(MOC) $(srcdir)/kmetamenu.h -o kmetamenu.moc
-+kdirmenu.moc: $(srcdir)/kdirmenu.h
-+ $(MOC) $(srcdir)/kdirmenu.h -o kdirmenu.moc
- #>+ 2
--mocs: kmetamenu.moc
-+mocs: kdirmenu.moc
-
- #>+ 3
--kdirmenu.moc: $(srcdir)/kdirmenu.h
-- $(MOC) $(srcdir)/kdirmenu.h -o kdirmenu.moc
-+kmetamenu.moc: $(srcdir)/kmetamenu.h
-+ $(MOC) $(srcdir)/kmetamenu.h -o kmetamenu.moc
-
- #>+ 2
--mocs: kdirmenu.moc
-+mocs: kmetamenu.moc
-
- #>+ 3
- kimcontactmenu.moc: $(srcdir)/kimcontactmenu.h
-@@ -907,10 +916,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kuick_plugin.moc kmetamenu.moc kdirmenu.moc kimcontactmenu.moc
-+ -rm -f kuick_plugin.moc kdirmenu.moc kmetamenu.moc kimcontactmenu.moc
-
- #>+ 2
--KDE_DIST=kmetamenu.h Makefile.in kuick_plugin.desktop kuickplugin.desktop kuick_plugin.h Makefile.am kdirmenu.h
-+KDE_DIST=kmetamenu.h kuick_plugin.desktop Makefile.in kuick_plugin.h kuickplugin.desktop Makefile.am kdirmenu.h
-
- #>+ 3
- clean-closures:
-@@ -958,7 +967,7 @@
-
-
- #>+ 11
--libkuickplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuick_plugin.cpp $(srcdir)/kdirmenu.cpp $(srcdir)/kmetamenu.cpp $(srcdir)/kimcontactmenu.cpp kuick_plugin.moc kdirmenu.moc kmetamenu.moc kimcontactmenu.moc
-+libkuickplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuick_plugin.cpp $(srcdir)/kdirmenu.cpp $(srcdir)/kmetamenu.cpp $(srcdir)/kimcontactmenu.cpp kuick_plugin.moc kmetamenu.moc kdirmenu.moc kimcontactmenu.moc
- @echo 'creating libkuickplugin_la.all_cpp.cpp ...'; \
- rm -f libkuickplugin_la.all_cpp.files libkuickplugin_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkuickplugin_la.all_cpp.final; \
---- konq-plugins/Makefile.in
-+++ konq-plugins/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/Makefile.in kdeaddons-3.5.5/konq-plugins/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/Makefile.in 2006-10-02 19:38:28.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -49541,6 +51767,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -365,9 +374,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -377,9 +386,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -394,9 +403,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49553,8 +51803,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- konq-plugins/mediarealfolder/Makefile.in
-+++ konq-plugins/mediarealfolder/Makefile.in
+@@ -698,9 +707,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/mediarealfolder/Makefile.in kdeaddons-3.5.5/konq-plugins/mediarealfolder/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/mediarealfolder/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/mediarealfolder/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -105,6 +105,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -49640,6 +51903,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -360,9 +369,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/mediarealfolder/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/mediarealfolder/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/mediarealfolder/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/mediarealfolder/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -372,9 +381,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/mediarealfolder/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/mediarealfolder/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/mediarealfolder/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/mediarealfolder/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/mediarealfolder/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -389,9 +398,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49652,8 +51939,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
---- konq-plugins/microformat/Makefile.in
-+++ konq-plugins/microformat/Makefile.in
+@@ -586,9 +595,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/mediarealfolder/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/mediarealfolder/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/mediarealfolder/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/mediarealfolder/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/mediarealfolder/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/microformat/Makefile.in kdeaddons-3.5.5/konq-plugins/microformat/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/microformat/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/microformat/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -139,6 +139,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -49739,6 +52039,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -406,9 +415,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/microformat/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/microformat/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/microformat/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/microformat/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/microformat/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/microformat/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/microformat/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/microformat/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/microformat/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -435,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49751,17 +52075,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -758,7 +767,7 @@
- -rm -f konqmficon.moc
+@@ -777,9 +786,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/microformat/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/microformat/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/microformat/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/microformat/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/microformat/Makefile.in
- #>+ 2
--KDE_DIST=mf_konqmficon.desktop Makefile.in konqmficon.h pluginbase.h microformat.png mf_konqmficon.rc microformat.svgz Makefile.am hcard.png
-+KDE_DIST=mf_konqmficon.desktop konqmficon.h Makefile.in pluginbase.h microformat.png mf_konqmficon.rc microformat.svgz Makefile.am hcard.png
- #>+ 3
- clean-closures:
---- konq-plugins/minitools/Makefile.in
-+++ konq-plugins/minitools/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/minitools/Makefile.in kdeaddons-3.5.5/konq-plugins/minitools/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/minitools/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/minitools/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -49847,6 +52175,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -397,9 +406,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/minitools/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/minitools/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/minitools/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/minitools/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -409,9 +418,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/minitools/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/minitools/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/minitools/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/minitools/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/minitools/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -426,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49859,37 +52211,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -731,7 +740,7 @@
- -rm -f minitoolsplugin.moc
+@@ -767,9 +776,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/minitools/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/minitools/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/minitools/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/minitools/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/minitools/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in minitoolsplugin.rc minitoolsplugin.desktop minitoolsplugin.h cr16-action-minitools.png cr48-action-minitools.png cr22-action-minitools.png Makefile.am cr32-action-minitools.png
-+KDE_DIST=Makefile.in minitoolsplugin.desktop minitoolsplugin.rc minitoolsplugin.h cr16-action-minitools.png cr48-action-minitools.png cr22-action-minitools.png Makefile.am cr32-action-minitools.png
- #>+ 3
- clean-closures:
-@@ -746,16 +755,16 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-minitools.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/minitools.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
- $(INSTALL_DATA) $(srcdir)/cr32-action-minitools.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/minitools.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-minitools.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/minitools.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
- $(INSTALL_DATA) $(srcdir)/cr48-action-minitools.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/minitools.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-minitools.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/minitools.png
-
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/minitools.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/minitools.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/minitools.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/minitools.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/minitools.png
-
- #>+ 15
- force-reedit:
---- konq-plugins/rellinks/Makefile.in
-+++ konq-plugins/rellinks/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/rellinks/Makefile.in kdeaddons-3.5.5/konq-plugins/rellinks/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/rellinks/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/rellinks/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -137,6 +137,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -49975,6 +52311,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -398,9 +407,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/rellinks/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/rellinks/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/rellinks/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/rellinks/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -410,9 +419,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/rellinks/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/rellinks/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/rellinks/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/rellinks/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/rellinks/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -427,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -49987,8 +52347,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- konq-plugins/searchbar/icons/Makefile.in
-+++ konq-plugins/searchbar/icons/Makefile.in
+@@ -748,9 +757,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/rellinks/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/rellinks/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/rellinks/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/rellinks/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/rellinks/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/searchbar/icons/Makefile.in kdeaddons-3.5.5/konq-plugins/searchbar/icons/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/searchbar/icons/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/searchbar/icons/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -92,6 +92,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -50074,6 +52447,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -346,9 +355,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/searchbar/icons/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/searchbar/icons/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/searchbar/icons/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/searchbar/icons/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -358,9 +367,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/searchbar/icons/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/searchbar/icons/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/searchbar/icons/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/searchbar/icons/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/searchbar/icons/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -375,9 +384,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50086,8 +52483,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- konq-plugins/searchbar/Makefile.in
-+++ konq-plugins/searchbar/Makefile.in
+@@ -543,9 +552,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/searchbar/icons/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/searchbar/icons/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/searchbar/icons/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/searchbar/icons/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/searchbar/icons/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/searchbar/Makefile.in kdeaddons-3.5.5/konq-plugins/searchbar/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/searchbar/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/searchbar/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -149,6 +149,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -50173,6 +52583,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -411,9 +420,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/searchbar/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/searchbar/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/searchbar/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/searchbar/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -423,9 +432,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/searchbar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/searchbar/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/searchbar/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/searchbar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/searchbar/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -440,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50185,17 +52619,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -853,7 +862,7 @@
- -rm -f searchbar.moc
+@@ -872,9 +881,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/searchbar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/searchbar/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/searchbar/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/searchbar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/searchbar/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in searchbar.desktop searchbar.h searchbar.rc searchbar.lsm Makefile.am
-+KDE_DIST=Makefile.in searchbar.h searchbar.desktop searchbar.rc searchbar.lsm Makefile.am
- #>+ 3
- clean-closures:
---- konq-plugins/sidebar/delicious/Makefile.in
-+++ konq-plugins/sidebar/delicious/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/sidebar/delicious/Makefile.in kdeaddons-3.5.5/konq-plugins/sidebar/delicious/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/sidebar/delicious/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/sidebar/delicious/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -159,6 +159,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -50281,6 +52719,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -432,9 +441,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -444,9 +453,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/delicious/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -461,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50293,52 +52755,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -866,11 +875,11 @@
+@@ -920,9 +929,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/delicious/Makefile.in
- #>+ 3
--mainWidget.moc: $(srcdir)/mainWidget.h
-- $(MOC) $(srcdir)/mainWidget.h -o mainWidget.moc
-+plugin.moc: $(srcdir)/plugin.h
-+ $(MOC) $(srcdir)/plugin.h -o plugin.moc
-
- #>+ 2
--mocs: mainWidget.moc
-+mocs: plugin.moc
-
- #>+ 3
- tagListItem.moc: $(srcdir)/tagListItem.h
-@@ -880,15 +889,15 @@
- mocs: tagListItem.moc
-
- #>+ 3
--plugin.moc: $(srcdir)/plugin.h
-- $(MOC) $(srcdir)/plugin.h -o plugin.moc
-+mainWidget.moc: $(srcdir)/mainWidget.h
-+ $(MOC) $(srcdir)/mainWidget.h -o mainWidget.moc
-
- #>+ 2
--mocs: plugin.moc
-+mocs: mainWidget.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f mainWidget.moc tagListItem.moc plugin.moc
-+ -rm -f plugin.moc tagListItem.moc mainWidget.moc
-
- #>+ 2
- KDE_DIST=Makefile.in delicious_add.desktop widget.ui Makefile.am
-@@ -949,7 +958,7 @@
-
-
- #>+ 11
--konqsidebar_delicious_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/plugin.cpp $(srcdir)/mainWidget.cpp $(srcdir)/tagListItem.cpp $(srcdir)/bookmarkListItem.cpp plugin_skel.cpp widget.cpp plugin.moc tagListItem.moc mainWidget.moc widget.moc
-+konqsidebar_delicious_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/plugin.cpp $(srcdir)/mainWidget.cpp $(srcdir)/tagListItem.cpp $(srcdir)/bookmarkListItem.cpp plugin_skel.cpp widget.cpp mainWidget.moc tagListItem.moc plugin.moc widget.moc
- @echo 'creating konqsidebar_delicious_la.all_cpp.cpp ...'; \
- rm -f konqsidebar_delicious_la.all_cpp.files konqsidebar_delicious_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> konqsidebar_delicious_la.all_cpp.final; \
---- konq-plugins/sidebar/delicious/pics/Makefile.in
-+++ konq-plugins/sidebar/delicious/pics/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/sidebar/delicious/pics/Makefile.in kdeaddons-3.5.5/konq-plugins/sidebar/delicious/pics/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/sidebar/delicious/pics/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/sidebar/delicious/pics/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -92,6 +92,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -50424,6 +52855,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -345,9 +354,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/pics/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/pics/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/pics/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/pics/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -357,9 +366,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/pics/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/delicious/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -374,9 +383,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50436,8 +52891,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- konq-plugins/sidebar/Makefile.in
-+++ konq-plugins/sidebar/Makefile.in
+@@ -542,9 +551,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/delicious/pics/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/delicious/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/delicious/pics/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/sidebar/Makefile.in kdeaddons-3.5.5/konq-plugins/sidebar/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/sidebar/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/sidebar/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -50523,6 +52991,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -362,9 +371,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/sidebar/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/sidebar/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -374,9 +383,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -391,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50535,8 +53027,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
---- konq-plugins/sidebar/mediaplayer/Makefile.in
-+++ konq-plugins/sidebar/mediaplayer/Makefile.in
+@@ -695,9 +704,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/konq-plugins/sidebar/mediaplayer/Makefile.in kdeaddons-3.5.5/konq-plugins/sidebar/mediaplayer/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/sidebar/mediaplayer/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/sidebar/mediaplayer/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -160,6 +160,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -50622,6 +53127,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -437,9 +446,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -449,9 +458,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/mediaplayer/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -466,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50634,51 +53163,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -905,18 +914,18 @@
- mocs: engine.moc
+@@ -954,9 +963,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/mediaplayer/Makefile.in
- #>+ 3
--controls.moc: $(srcdir)/controls.h
-- $(MOC) $(srcdir)/controls.h -o controls.moc
-+player.moc: $(srcdir)/player.h
-+ $(MOC) $(srcdir)/player.h -o player.moc
- #>+ 2
--mocs: controls.moc
-+mocs: player.moc
-
- #>+ 3
--player.moc: $(srcdir)/player.h
-- $(MOC) $(srcdir)/player.h -o player.moc
-+controls.moc: $(srcdir)/controls.h
-+ $(MOC) $(srcdir)/controls.h -o controls.moc
-
- #>+ 2
--mocs: player.moc
-+mocs: controls.moc
-
- #>+ 3
- mediawidget.moc: $(srcdir)/mediawidget.h
-@@ -927,7 +936,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f mediaplayer.moc engine.moc controls.moc player.moc mediawidget.moc
-+ -rm -f mediaplayer.moc engine.moc player.moc controls.moc mediawidget.moc
-
- #>+ 2
- KDE_DIST=engine.h mplayer_add.desktop Makefile.in mediawidget_skel_designer.ui controls.h mediaplayerplugin.desktop mediaplayer.h player.h mediawidget_skel.ui Makefile.am mediawidget.h
-@@ -983,7 +992,7 @@
-
-
- #>+ 11
--konqsidebar_mediaplayer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/engine.cpp $(srcdir)/player.cpp $(srcdir)/mediawidget.cpp $(srcdir)/mediaplayer.cpp $(srcdir)/controls.cpp mediawidget_skel.cpp mediaplayer.moc mediawidget_skel.moc engine.moc player.moc controls.moc mediawidget.moc
-+konqsidebar_mediaplayer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/engine.cpp $(srcdir)/player.cpp $(srcdir)/mediawidget.cpp $(srcdir)/mediaplayer.cpp $(srcdir)/controls.cpp mediawidget_skel.cpp mediaplayer.moc mediawidget_skel.moc engine.moc controls.moc player.moc mediawidget.moc
- @echo 'creating konqsidebar_mediaplayer_la.all_cpp.cpp ...'; \
- rm -f konqsidebar_mediaplayer_la.all_cpp.files konqsidebar_mediaplayer_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> konqsidebar_mediaplayer_la.all_cpp.final; \
---- konq-plugins/sidebar/mediaplayer/pics/Makefile.in
-+++ konq-plugins/sidebar/mediaplayer/pics/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/sidebar/mediaplayer/pics/Makefile.in kdeaddons-3.5.5/konq-plugins/sidebar/mediaplayer/pics/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/sidebar/mediaplayer/pics/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/sidebar/mediaplayer/pics/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -92,6 +92,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -50764,6 +53263,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -345,9 +354,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/pics/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/pics/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/pics/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/pics/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -357,9 +366,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/pics/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/mediaplayer/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -374,9 +383,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50776,38 +53299,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,23 +535,23 @@
+@@ -554,9 +563,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/mediaplayer/pics/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/mediaplayer/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/mediaplayer/pics/Makefile.in
- #>+ 19
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-konqsidebar_mediaplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-konqsidebar_mediaplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-konqsidebar_mediaplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-konqsidebar_mediaplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-konqsidebar_mediaplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/lo32-app-konqsidebar_mediaplayer.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/konqsidebar_mediaplayer.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-konqsidebar_mediaplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/konqsidebar_mediaplayer.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png
-
- #>+ 15
- force-reedit:
---- konq-plugins/sidebar/metabar/Makefile.in
-+++ konq-plugins/sidebar/metabar/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/sidebar/metabar/Makefile.in kdeaddons-3.5.5/konq-plugins/sidebar/metabar/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/sidebar/metabar/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/sidebar/metabar/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -109,6 +109,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -50893,6 +53399,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -362,9 +371,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -374,9 +383,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/metabar/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -391,9 +400,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -50905,17 +53435,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -680,7 +689,7 @@
- .NOEXPORT:
+@@ -695,9 +704,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/metabar/Makefile.in
- #>+ 2
--KDE_DIST=stamp-h.in Makefile.in config.h.in metabar.kdevelop metabar.kdevses Doxyfile configure.in.in Makefile.am
-+KDE_DIST=stamp-h.in Makefile.in metabar.kdevelop config.h.in metabar.kdevses Doxyfile configure.in.in Makefile.am
- #>+ 2
- docs-am:
---- konq-plugins/sidebar/metabar/src/Makefile.in
-+++ konq-plugins/sidebar/metabar/src/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/sidebar/metabar/src/Makefile.in kdeaddons-3.5.5/konq-plugins/sidebar/metabar/src/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/sidebar/metabar/src/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/sidebar/metabar/src/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -154,6 +154,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -51001,6 +53535,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -428,9 +437,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/src/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/src/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/src/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/src/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -440,9 +449,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/src/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/src/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/src/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/src/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/metabar/src/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51013,124 +53571,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -834,6 +843,13 @@
- mocs: remoteplugin.moc
+@@ -936,9 +945,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/src/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/src/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/metabar/src/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/metabar/src/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/metabar/src/Makefile.in
- #>+ 3
-+defaultplugin.moc: $(srcdir)/defaultplugin.h
-+ $(MOC) $(srcdir)/defaultplugin.h -o defaultplugin.moc
-+
-+#>+ 2
-+mocs: defaultplugin.moc
-+
-+#>+ 3
- serviceloader.moc: $(srcdir)/serviceloader.h
- $(MOC) $(srcdir)/serviceloader.h -o serviceloader.moc
-@@ -848,13 +864,6 @@
- mocs: httpplugin.moc
-
- #>+ 3
--defaultplugin.moc: $(srcdir)/defaultplugin.h
-- $(MOC) $(srcdir)/defaultplugin.h -o defaultplugin.moc
--
--#>+ 2
--mocs: defaultplugin.moc
--
--#>+ 3
- metabar.moc: $(srcdir)/metabar.h
- $(MOC) $(srcdir)/metabar.h -o metabar.moc
-
-@@ -869,18 +878,18 @@
- mocs: metabarfunctions.moc
-
- #>+ 3
--settingsplugin.moc: $(srcdir)/settingsplugin.h
-- $(MOC) $(srcdir)/settingsplugin.h -o settingsplugin.moc
-+protocolplugin.moc: $(srcdir)/protocolplugin.h
-+ $(MOC) $(srcdir)/protocolplugin.h -o protocolplugin.moc
-
- #>+ 2
--mocs: settingsplugin.moc
-+mocs: protocolplugin.moc
-
- #>+ 3
--protocolplugin.moc: $(srcdir)/protocolplugin.h
-- $(MOC) $(srcdir)/protocolplugin.h -o protocolplugin.moc
-+settingsplugin.moc: $(srcdir)/settingsplugin.h
-+ $(MOC) $(srcdir)/settingsplugin.h -o settingsplugin.moc
-
- #>+ 2
--mocs: protocolplugin.moc
-+mocs: settingsplugin.moc
-
- #>+ 3
- metabarwidget.moc: $(srcdir)/metabarwidget.h
-@@ -891,10 +900,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f configdialog.moc remoteplugin.moc serviceloader.moc httpplugin.moc defaultplugin.moc metabar.moc metabarfunctions.moc settingsplugin.moc protocolplugin.moc metabarwidget.moc
-+ -rm -f configdialog.moc remoteplugin.moc defaultplugin.moc serviceloader.moc httpplugin.moc metabar.moc metabarfunctions.moc protocolplugin.moc settingsplugin.moc metabarwidget.moc
-
- #>+ 2
--KDE_DIST=metabar_add.desktop layout.html hi48-app-metabar.png Makefile.in hisc-app-metabar.svgz hi128-app-metabar.png default.css serviceloader.h hi16-app-metabar.png metabar.desktop hi32-app-metabar.png hi64-app-metabar.png Makefile.am configdialog.h metabar.h iconsrc
-+KDE_DIST=layout.html hi48-app-metabar.png hisc-app-metabar.svgz default.css serviceloader.h metabar.desktop hi32-app-metabar.png hi64-app-metabar.png metabar.h configdialog.h iconsrc metabar_add.desktop Makefile.in hi128-app-metabar.png hi16-app-metabar.png Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -907,24 +916,24 @@
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- $(INSTALL_DATA) $(srcdir)/hi64-app-metabar.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/metabar.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/hi128-app-metabar.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/metabar.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/hi48-app-metabar.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/metabar.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/hisc-app-metabar.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/metabar.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/hi32-app-metabar.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/metabar.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/hisc-app-metabar.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/metabar.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/hi48-app-metabar.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/metabar.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-metabar.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/metabar.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/hi128-app-metabar.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/metabar.png
-
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/metabar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/metabar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/metabar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/metabar.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/metabar.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/metabar.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/metabar.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/metabar.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/metabar.png
-
- #>+ 15
- force-reedit:
-@@ -965,7 +974,7 @@
-
-
- #>+ 11
--konqsidebar_metabar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metabar.cpp $(srcdir)/metabarwidget.cpp $(srcdir)/configdialog.cpp $(srcdir)/serviceloader.cpp $(srcdir)/defaultplugin.cpp $(srcdir)/protocolplugin.cpp $(srcdir)/settingsplugin.cpp $(srcdir)/remoteplugin.cpp $(srcdir)/httpplugin.cpp $(srcdir)/metabarfunctions.cpp remoteplugin.moc configdialog.moc defaultplugin.moc httpplugin.moc serviceloader.moc metabar.moc metabarfunctions.moc protocolplugin.moc settingsplugin.moc metabarwidget.moc
-+konqsidebar_metabar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metabar.cpp $(srcdir)/metabarwidget.cpp $(srcdir)/configdialog.cpp $(srcdir)/serviceloader.cpp $(srcdir)/defaultplugin.cpp $(srcdir)/protocolplugin.cpp $(srcdir)/settingsplugin.cpp $(srcdir)/remoteplugin.cpp $(srcdir)/httpplugin.cpp $(srcdir)/metabarfunctions.cpp remoteplugin.moc configdialog.moc httpplugin.moc serviceloader.moc defaultplugin.moc metabar.moc metabarfunctions.moc settingsplugin.moc protocolplugin.moc metabarwidget.moc
- @echo 'creating konqsidebar_metabar_la.all_cpp.cpp ...'; \
- rm -f konqsidebar_metabar_la.all_cpp.files konqsidebar_metabar_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> konqsidebar_metabar_la.all_cpp.final; \
-@@ -1021,5 +1030,5 @@
- remoteplugin.lo: remoteplugin.moc
- metabarfunctions.lo: metabarfunctions.moc
- metabar.o: metabar.moc
--defaultplugin.o: defaultplugin.moc
- serviceloader.lo: serviceloader.moc
-+defaultplugin.o: defaultplugin.moc
---- konq-plugins/sidebar/newsticker/Makefile.in
-+++ konq-plugins/sidebar/newsticker/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/sidebar/newsticker/Makefile.in kdeaddons-3.5.5/konq-plugins/sidebar/newsticker/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/sidebar/newsticker/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/sidebar/newsticker/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -159,6 +159,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -51216,6 +53671,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -437,9 +446,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -449,9 +458,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/newsticker/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -466,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51228,55 +53707,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -906,18 +915,18 @@
- mocs: nspanel.moc
+@@ -973,9 +982,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/newsticker/Makefile.in
- #>+ 3
--norsswidget.moc: $(srcdir)/norsswidget.h
-- $(MOC) $(srcdir)/norsswidget.h -o norsswidget.moc
-+nsstacktabwidget.moc: $(srcdir)/nsstacktabwidget.h
-+ $(MOC) $(srcdir)/nsstacktabwidget.h -o nsstacktabwidget.moc
- #>+ 2
--mocs: norsswidget.moc
-+mocs: nsstacktabwidget.moc
-
- #>+ 3
--nsstacktabwidget.moc: $(srcdir)/nsstacktabwidget.h
-- $(MOC) $(srcdir)/nsstacktabwidget.h -o nsstacktabwidget.moc
-+norsswidget.moc: $(srcdir)/norsswidget.h
-+ $(MOC) $(srcdir)/norsswidget.h -o norsswidget.moc
-
- #>+ 2
--mocs: nsstacktabwidget.moc
-+mocs: norsswidget.moc
-
- #>+ 3
- sidebar_news.moc: $(srcdir)/sidebar_news.h
-@@ -935,10 +944,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f nspanel.moc norsswidget.moc nsstacktabwidget.moc sidebar_news.moc configfeeds.moc
-+ -rm -f nspanel.moc nsstacktabwidget.moc norsswidget.moc sidebar_news.moc configfeeds.moc
-
- #>+ 2
--KDE_DIST=konq_sidebarnews.kcfg Makefile.in configfeedsbase.ui sidebarsettings.kcfgc configfeeds.h news_add.desktop Makefile.am
-+KDE_DIST=configfeedsbase.ui configfeeds.h news_add.desktop konq_sidebarnews.kcfg Makefile.in sidebarsettings.kcfgc Makefile.am
-
- #>+ 5
- clean-idl:
-@@ -1002,7 +1011,7 @@
-
-
- #>+ 11
--konq_sidebarnews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sidebar_news.cpp $(srcdir)/nsstacktabwidget.cpp $(srcdir)/nspanel.cpp $(srcdir)/norsswidget.cpp $(srcdir)/configfeeds.cpp sidebar_news_skel.cpp nspanel_skel.cpp configfeedsbase.cpp sidebarsettings.cpp nspanel.moc nsstacktabwidget.moc norsswidget.moc sidebar_news.moc configfeedsbase.moc configfeeds.moc
-+konq_sidebarnews_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sidebar_news.cpp $(srcdir)/nsstacktabwidget.cpp $(srcdir)/nspanel.cpp $(srcdir)/norsswidget.cpp $(srcdir)/configfeeds.cpp sidebar_news_skel.cpp nspanel_skel.cpp configfeedsbase.cpp sidebarsettings.cpp nspanel.moc norsswidget.moc nsstacktabwidget.moc sidebar_news.moc configfeedsbase.moc configfeeds.moc
- @echo 'creating konq_sidebarnews_la.all_cpp.cpp ...'; \
- rm -f konq_sidebarnews_la.all_cpp.files konq_sidebarnews_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> konq_sidebarnews_la.all_cpp.final; \
---- konq-plugins/sidebar/newsticker/pics/Makefile.in
-+++ konq-plugins/sidebar/newsticker/pics/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/sidebar/newsticker/pics/Makefile.in kdeaddons-3.5.5/konq-plugins/sidebar/newsticker/pics/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/sidebar/newsticker/pics/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/sidebar/newsticker/pics/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -92,6 +92,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -51362,6 +53807,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -345,9 +354,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/pics/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/pics/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/pics/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/pics/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -357,9 +366,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/pics/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/newsticker/pics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -374,9 +383,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51374,17 +53843,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -519,7 +528,7 @@
- .NOEXPORT:
+@@ -542,9 +551,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/pics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/pics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/sidebar/newsticker/pics/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/sidebar/newsticker/pics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/sidebar/newsticker/pics/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in Makefile.am livemark-item.png cr16-app-konqsidebar_news.png LICENSE
-+KDE_DIST=cr16-app-konqsidebar_news.png Makefile.in Makefile.am livemark-item.png LICENSE
- #>+ 2
- docs-am:
---- konq-plugins/uachanger/Makefile.in
-+++ konq-plugins/uachanger/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/uachanger/Makefile.in kdeaddons-3.5.5/konq-plugins/uachanger/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/uachanger/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/uachanger/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -136,6 +136,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -51470,6 +53943,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -397,9 +406,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/uachanger/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/uachanger/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/uachanger/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/uachanger/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -409,9 +418,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/uachanger/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/uachanger/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/uachanger/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/uachanger/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/uachanger/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -426,9 +435,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51482,17 +53979,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -728,7 +737,7 @@
- -rm -f uachangerplugin.moc
+@@ -747,9 +756,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/uachanger/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/uachanger/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/uachanger/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/uachanger/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/uachanger/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in uachangerplugin.rc uachangerplugin.h uachangerplugin.desktop Makefile.am
-+KDE_DIST=uachangerplugin.h uachangerplugin.desktop Makefile.in uachangerplugin.rc Makefile.am
- #>+ 3
- clean-closures:
---- konq-plugins/validators/Makefile.in
-+++ konq-plugins/validators/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/validators/Makefile.in kdeaddons-3.5.5/konq-plugins/validators/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/validators/Makefile.in 2006-10-02 19:38:29.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/validators/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -141,6 +141,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -51578,6 +54079,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -405,9 +414,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/validators/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/validators/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/validators/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/validators/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -417,9 +426,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/validators/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/validators/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/validators/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/validators/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/validators/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -434,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51590,44 +54115,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -753,7 +762,7 @@
- -rm -f validatorsdialog.moc plugin_validators.moc
+@@ -791,9 +800,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/validators/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/validators/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/validators/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/validators/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/validators/Makefile.in
- #>+ 2
--KDE_DIST=plugin_validators.rc cr22-action-cssvalidator.png cr22-action-htmlvalidator.png Makefile.in validatorsdialog.h plugin_validators.desktop cr16-action-cssvalidator.png cr16-action-validators.png cr22-action-validators.png cr16-action-htmlvalidator.png Makefile.am plugin_validators.h
-+KDE_DIST=cr22-action-cssvalidator.png cr22-action-htmlvalidator.png plugin_validators.desktop validatorsdialog.h cr16-action-cssvalidator.png plugin_validators.rc Makefile.in cr16-action-validators.png cr22-action-validators.png cr16-action-htmlvalidator.png Makefile.am plugin_validators.h
- #>+ 3
- clean-closures:
-@@ -765,21 +774,21 @@
- #>+ 18
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-cssvalidator.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/cssvalidator.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-validators.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/validators.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-htmlvalidator.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/htmlvalidator.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-validators.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/validators.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-htmlvalidator.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/htmlvalidator.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-cssvalidator.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/cssvalidator.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-cssvalidator.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/cssvalidator.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-validators.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/validators.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/cssvalidator.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/validators.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/htmlvalidator.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/validators.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/htmlvalidator.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/cssvalidator.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/cssvalidator.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/validators.png
-
- #>+ 15
- force-reedit:
---- konq-plugins/webarchiver/Makefile.in
-+++ konq-plugins/webarchiver/Makefile.in
+diff -ur kdeaddons-3.5.5.old/konq-plugins/webarchiver/Makefile.in kdeaddons-3.5.5/konq-plugins/webarchiver/Makefile.in
+--- kdeaddons-3.5.5.old/konq-plugins/webarchiver/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/konq-plugins/webarchiver/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -150,6 +150,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -51713,6 +54215,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -422,9 +431,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/webarchiver/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/webarchiver/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign konq-plugins/webarchiver/Makefile
++#>- $(AUTOMAKE) --gnu konq-plugins/webarchiver/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -434,9 +443,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/webarchiver/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/webarchiver/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/webarchiver/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/webarchiver/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/webarchiver/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -451,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51725,17 +54251,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -810,7 +819,7 @@
- -rm -f archivedialog.moc plugin_webarchiver.moc webarchivecreator.moc
+@@ -845,9 +854,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign konq-plugins/webarchiver/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konq-plugins/webarchiver/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign konq-plugins/webarchiver/Makefile
++ $(AUTOMAKE) --gnu konq-plugins/webarchiver/Makefile
+ cd $(top_srcdir) && perl admin/am_edit konq-plugins/webarchiver/Makefile.in
- #>+ 2
--KDE_DIST=webarchivecreator.h Makefile.in plugin_webarchiver.h archivedialog.h archiveviewbase.ui plugin_webarchiver.desktop cr22-action-webarchiver.png plugin_webarchiver.rc webarchivethumbnail.desktop Makefile.am cr16-action-webarchiver.png
-+KDE_DIST=webarchivecreator.h plugin_webarchiver.h archiveviewbase.ui plugin_webarchiver.desktop webarchivethumbnail.desktop cr16-action-webarchiver.png Makefile.in archivedialog.h cr22-action-webarchiver.png plugin_webarchiver.rc Makefile.am
- #>+ 4
- clean-ui:
---- ksig/Makefile.in
-+++ ksig/Makefile.in
+diff -ur kdeaddons-3.5.5.old/ksig/Makefile.in kdeaddons-3.5.5/ksig/Makefile.in
+--- kdeaddons-3.5.5.old/ksig/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/ksig/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -145,6 +145,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -51821,6 +54351,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -412,9 +421,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ksig/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ksig/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign ksig/Makefile
++#>- $(AUTOMAKE) --gnu ksig/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -424,9 +433,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ksig/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ksig/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign ksig/Makefile
++ $(AUTOMAKE) --gnu ksig/Makefile
+ cd $(top_srcdir) && perl admin/am_edit ksig/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -441,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -51833,46 +54387,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -767,7 +776,7 @@
- -rm -f siglistview.moc ksig.moc standardtext.moc
+@@ -798,9 +807,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ksig/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ksig/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign ksig/Makefile
++ $(AUTOMAKE) --gnu ksig/Makefile
+ cd $(top_srcdir) && perl admin/am_edit ksig/Makefile.in
- #>+ 2
--KDE_DIST=siglistview.h ksig.h Makefile.in ksigui.rc siggenerator.h ksig.spec hi32-app-ksig.png siglistviewitem.h standardtext.h standardtextbase.ui ksig.desktop Makefile.am hi16-app-ksig.png
-+KDE_DIST=ksigui.rc hi32-app-ksig.png standardtextbase.ui siglistview.h ksig.h Makefile.in siggenerator.h ksig.spec siglistviewitem.h standardtext.h ksig.desktop Makefile.am hi16-app-ksig.png
- #>+ 4
- clean-ui:
-@@ -779,14 +788,14 @@
-
- #>+ 10
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/hi32-app-ksig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksig.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/hi16-app-ksig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksig.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/hi32-app-ksig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksig.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksig.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksig.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksig.png
-
- #>+ 15
- force-reedit:
---- Makefile.am
-+++ Makefile.am
-@@ -1,7 +1,7 @@
- ## kdeaddons/Makefile.am
- ## (C) 1997 Stephan Kulow
-
--AUTOMAKE_OPTIONS = foreign 1.5
-+AUTOMAKE_OPTIONS = foreign 1.6.1
-
- EXTRA_DIST = admin
- dist-hook:
---- Makefile.in
-+++ Makefile.in
+diff -ur kdeaddons-3.5.5.old/Makefile.in kdeaddons-3.5.5/Makefile.in
+--- kdeaddons-3.5.5.old/Makefile.in 2006-10-02 19:38:26.000000000 +0200
++++ kdeaddons-3.5.5/Makefile.in 2006-10-10 01:34:59.000000000 +0200
@@ -125,6 +125,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -51949,15 +54478,6 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
renamedlgplugins_SUBDIR_included_FALSE = @renamedlgplugins_SUBDIR_included_FALSE@
-@@ -363,7 +372,7 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--AUTOMAKE_OPTIONS = foreign 1.5
-+AUTOMAKE_OPTIONS = foreign 1.6.1
- EXTRA_DIST = admin
- SUBDIRS = $(TOPSUBDIRS)
- #>- all: config.h
@@ -374,7 +383,7 @@
.SUFFIXES:
am--refresh:
@@ -51995,13 +54515,14 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=configure.in subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in acinclude.m4 Makefile.am kdeaddons.lsm Makefile.am.in
-+KDE_DIST=stamp-h.in COPYING-DOCS subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 kdeaddons.lsm Makefile.am.in
+-KDE_DIST=configure.in COPYING-DOCS subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in Makefile.am acinclude.m4 kdeaddons.lsm Makefile.am.in
++KDE_DIST=stamp-h.in configure.in COPYING-DOCS subdirs Makefile.cvs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in configure Makefile.am acinclude.m4 kdeaddons.lsm Makefile.am.in
#>+ 2
docs-am:
---- noatun-plugins/alarm/Makefile.in
-+++ noatun-plugins/alarm/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/alarm/Makefile.in kdeaddons-3.5.5/noatun-plugins/alarm/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/alarm/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/alarm/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -143,6 +143,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -52087,6 +54608,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -413,9 +422,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/alarm/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/alarm/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/alarm/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/alarm/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -425,9 +434,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/alarm/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/alarm/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/alarm/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/alarm/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/alarm/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -442,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52099,17 +54644,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -760,7 +769,7 @@
- -rm -f wakeup.moc kminutespinbox.moc kpercentspinbox.moc
+@@ -779,9 +788,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/alarm/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/alarm/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/alarm/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/alarm/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/alarm/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in wakeup.plugin Makefile.am
-+KDE_DIST=wakeup.plugin Makefile.in Makefile.am
- #>+ 3
- clean-closures:
---- noatun-plugins/alsaplayer/Makefile.in
-+++ noatun-plugins/alsaplayer/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/alsaplayer/Makefile.in kdeaddons-3.5.5/noatun-plugins/alsaplayer/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/alsaplayer/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/alsaplayer/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -142,6 +142,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -52195,6 +54744,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -417,9 +426,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/alsaplayer/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/alsaplayer/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/alsaplayer/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/alsaplayer/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -429,9 +438,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/alsaplayer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/alsaplayer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/alsaplayer/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/alsaplayer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/alsaplayer/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -446,9 +455,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52207,17 +54780,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -765,7 +774,7 @@
- -rm -f seeker.moc userinterface.moc configmodule.moc
+@@ -789,9 +798,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/alsaplayer/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/alsaplayer/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/alsaplayer/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/alsaplayer/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/alsaplayer/Makefile.in
- #>+ 2
--KDE_DIST=Custom.cw Makefile.in alsaplayerui.plugin AlsaPlayer.ui Makefile.am
-+KDE_DIST=alsaplayerui.plugin Custom.cw Makefile.in AlsaPlayer.ui Makefile.am
- #>+ 4
- clean-ui:
---- noatun-plugins/blurscope/Makefile.in
-+++ noatun-plugins/blurscope/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/blurscope/Makefile.in kdeaddons-3.5.5/noatun-plugins/blurscope/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/blurscope/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/blurscope/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -139,6 +139,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -52303,6 +54880,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -402,9 +411,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/blurscope/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/blurscope/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/blurscope/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/blurscope/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -414,9 +423,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/blurscope/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/blurscope/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/blurscope/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/blurscope/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/blurscope/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -431,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52315,8 +54916,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- noatun-plugins/charlatan/Makefile.in
-+++ noatun-plugins/charlatan/Makefile.in
+@@ -739,9 +748,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/blurscope/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/blurscope/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/blurscope/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/blurscope/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/blurscope/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/charlatan/Makefile.in kdeaddons-3.5.5/noatun-plugins/charlatan/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/charlatan/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/charlatan/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -142,6 +142,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -52402,6 +55016,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -409,9 +418,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/charlatan/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/charlatan/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/charlatan/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/charlatan/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -421,9 +430,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/charlatan/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/charlatan/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/charlatan/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/charlatan/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/charlatan/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -438,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52414,17 +55052,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -757,7 +766,7 @@
- -rm -f seeker.moc userinterface.moc configmodule.moc
+@@ -776,9 +785,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/charlatan/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/charlatan/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/charlatan/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/charlatan/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/charlatan/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in charlatanui.plugin Makefile.am pixmaps.h
-+KDE_DIST=pixmaps.h Makefile.in charlatanui.plugin Makefile.am
- #>+ 3
- clean-closures:
---- noatun-plugins/dub/dub/Makefile.in
-+++ noatun-plugins/dub/dub/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/dub/dub/Makefile.in kdeaddons-3.5.5/noatun-plugins/dub/dub/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/dub/dub/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/dub/dub/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -142,6 +142,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -52510,6 +55152,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -413,9 +422,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/dub/dub/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/dub/dub/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/dub/dub/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/dub/dub/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -425,9 +434,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/dub/dub/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/dub/dub/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/dub/dub/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/dub/dub/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/dub/dub/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -442,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52522,17 +55188,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -778,7 +787,7 @@
- -rm -f dub.moc dubapp.moc fileselectorwidget.moc dubview.moc dubconfigmodule.moc
+@@ -802,9 +811,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/dub/dub/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/dub/dub/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/dub/dub/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/dub/dub/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/dub/dub/Makefile.in
- #>+ 2
--KDE_DIST=random.h Makefile.in dubconfigmodule.h dubprefs.ui Makefile.am dubapp.h
-+KDE_DIST=dubconfigmodule.h dubprefs.ui random.h Makefile.in Makefile.am dubapp.h
- #>+ 4
- clean-ui:
---- noatun-plugins/dub/Makefile.in
-+++ noatun-plugins/dub/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/dub/Makefile.in kdeaddons-3.5.5/noatun-plugins/dub/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/dub/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/dub/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -111,6 +111,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -52630,17 +55300,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -688,7 +697,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Makefile.in design.txt configure.in.in Makefile.am
-+KDE_DIST=configure.in.in Makefile.in design.txt Makefile.am
-
- #>+ 2
- docs-am:
---- noatun-plugins/ffrs/Makefile.in
-+++ noatun-plugins/ffrs/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/ffrs/Makefile.in kdeaddons-3.5.5/noatun-plugins/ffrs/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/ffrs/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/ffrs/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -52726,6 +55388,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -402,9 +411,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/ffrs/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/ffrs/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/ffrs/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/ffrs/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -414,9 +423,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/ffrs/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/ffrs/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/ffrs/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/ffrs/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/ffrs/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -431,9 +440,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52738,17 +55424,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -733,7 +742,7 @@
- -rm -f ffrs.moc
+@@ -752,9 +761,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/ffrs/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/ffrs/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/ffrs/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/ffrs/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/ffrs/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in ffrs.plugin Makefile.am
-+KDE_DIST=ffrs.plugin Makefile.in Makefile.am
- #>+ 3
- clean-closures:
---- noatun-plugins/luckytag/Makefile.in
-+++ noatun-plugins/luckytag/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/luckytag/Makefile.in kdeaddons-3.5.5/noatun-plugins/luckytag/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/luckytag/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/luckytag/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -52834,6 +55524,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -401,9 +410,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/luckytag/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/luckytag/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/luckytag/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/luckytag/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -413,9 +422,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/luckytag/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/luckytag/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/luckytag/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/luckytag/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/luckytag/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -430,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52846,17 +55560,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -719,7 +728,7 @@
+@@ -738,9 +747,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/luckytag/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/luckytag/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/luckytag/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/luckytag/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/luckytag/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in luckytag.h luckytag.plugin parsedmp3filename.h Makefile.am
-+KDE_DIST=luckytag.plugin parsedmp3filename.h Makefile.in luckytag.h Makefile.am
-
- #>+ 3
- clean-closures:
---- noatun-plugins/lyrics/Makefile.in
-+++ noatun-plugins/lyrics/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/lyrics/Makefile.in kdeaddons-3.5.5/noatun-plugins/lyrics/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/lyrics/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/lyrics/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -142,6 +142,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -52942,6 +55660,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -406,9 +415,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/lyrics/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/lyrics/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/lyrics/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/lyrics/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -418,9 +427,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/lyrics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/lyrics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/lyrics/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/lyrics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/lyrics/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -435,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -52954,17 +55696,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -753,7 +762,7 @@
- -rm -f cmodule.moc historymanager.moc lyrics.moc
+@@ -772,9 +781,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/lyrics/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/lyrics/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/lyrics/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/lyrics/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/lyrics/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in lyrics.plugin lyricsui.rc cmodule.h Makefile.am historymanager.h
-+KDE_DIST=lyricsui.rc historymanager.h Makefile.in lyrics.plugin cmodule.h Makefile.am
- #>+ 3
- clean-closures:
---- noatun-plugins/Makefile.in
-+++ noatun-plugins/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/Makefile.in kdeaddons-3.5.5/noatun-plugins/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -110,6 +110,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -53050,6 +55796,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -370,9 +379,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -382,9 +391,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -399,9 +408,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53062,17 +55832,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -688,7 +697,7 @@
- .NOEXPORT:
+@@ -703,9 +712,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in configure.in.bot configure.in.in Makefile.am
-+KDE_DIST=configure.in.bot configure.in.in Makefile.in Makefile.am
- #>+ 2
- docs-am:
---- noatun-plugins/nexscope/Makefile.in
-+++ noatun-plugins/nexscope/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/nexscope/Makefile.in kdeaddons-3.5.5/noatun-plugins/nexscope/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/nexscope/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/nexscope/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -160,6 +160,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -53158,6 +55932,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -428,9 +437,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/nexscope/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/nexscope/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/nexscope/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/nexscope/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -440,9 +449,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/nexscope/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/nexscope/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/nexscope/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/nexscope/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/nexscope/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -457,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53170,17 +55968,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -841,7 +850,7 @@
- -rm -f nex.moc gui.moc noatunplugin.moc regionwidget.moc
+@@ -860,9 +869,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/nexscope/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/nexscope/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/nexscope/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/nexscope/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/nexscope/Makefile.in
- #>+ 2
--KDE_DIST=nexscope.plugin Makefile.in renderers.h convolve.h noatunplugin.h gui.h Makefile.am nex.h regionwidget.h
-+KDE_DIST=nexscope.plugin convolve.h gui.h Makefile.in renderers.h noatunplugin.h Makefile.am nex.h regionwidget.h
- #>+ 3
- clean-closures:
---- noatun-plugins/noatunmadness/Makefile.in
-+++ noatun-plugins/noatunmadness/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/noatunmadness/Makefile.in kdeaddons-3.5.5/noatun-plugins/noatunmadness/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/noatunmadness/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/noatunmadness/Makefile.in 2006-10-10 01:35:01.000000000 +0200
@@ -135,6 +135,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -53266,6 +56068,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -398,9 +407,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/noatunmadness/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/noatunmadness/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/noatunmadness/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/noatunmadness/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -410,9 +419,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/noatunmadness/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/noatunmadness/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/noatunmadness/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/noatunmadness/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/noatunmadness/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -427,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53278,8 +56104,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- noatun-plugins/oblique/Makefile.in
-+++ noatun-plugins/oblique/Makefile.in
+@@ -745,9 +754,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/noatunmadness/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/noatunmadness/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/noatunmadness/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/noatunmadness/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/noatunmadness/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/oblique/Makefile.in kdeaddons-3.5.5/noatun-plugins/oblique/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/oblique/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/oblique/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -158,6 +158,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -53365,6 +56204,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -424,9 +433,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/oblique/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/oblique/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/oblique/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/oblique/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -436,9 +445,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/oblique/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/oblique/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/oblique/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/oblique/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/oblique/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -453,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53377,17 +56240,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -921,7 +930,7 @@
- -rm -f base.moc oblique.moc tree.moc view.moc menu.moc cmodule.moc
+@@ -940,9 +949,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/oblique/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/oblique/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/oblique/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/oblique/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/oblique/Makefile.in
- #>+ 2
--KDE_DIST=base.h selector.h kdbt.h oblique.h view.h Makefile.in kbuffer.h oblique.plugin kdatacollection.h obliqueui.rc file.h query.h tree.h cmodule.h configure.in.in Makefile.am menu.h
-+KDE_DIST=base.h selector.h obliqueui.rc file.h query.h configure.in.in kdbt.h oblique.h view.h Makefile.in kbuffer.h oblique.plugin kdatacollection.h tree.h cmodule.h Makefile.am menu.h
- #>+ 3
- clean-closures:
---- noatun-plugins/oblique/schemas/Makefile.in
-+++ noatun-plugins/oblique/schemas/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/oblique/schemas/Makefile.in kdeaddons-3.5.5/noatun-plugins/oblique/schemas/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/oblique/schemas/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/oblique/schemas/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -102,6 +102,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -53473,6 +56340,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -356,9 +365,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/oblique/schemas/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/oblique/schemas/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/oblique/schemas/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/oblique/schemas/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -368,9 +377,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/oblique/schemas/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/oblique/schemas/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/oblique/schemas/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/oblique/schemas/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/oblique/schemas/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -385,9 +394,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53485,17 +56376,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -546,7 +555,7 @@
- .NOEXPORT:
+@@ -561,9 +570,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/oblique/schemas/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/oblique/schemas/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/oblique/schemas/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/oblique/schemas/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/oblique/schemas/Makefile.in
- #>+ 2
--KDE_DIST=standard Makefile.in obliqueschema.dtd Makefile.am
-+KDE_DIST=standard obliqueschema.dtd Makefile.in Makefile.am
- #>+ 2
- docs-am:
---- noatun-plugins/pitchablespeed/Makefile.in
-+++ noatun-plugins/pitchablespeed/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/pitchablespeed/Makefile.in kdeaddons-3.5.5/noatun-plugins/pitchablespeed/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/pitchablespeed/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/pitchablespeed/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -142,6 +142,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -53581,6 +56476,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -408,9 +417,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/pitchablespeed/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/pitchablespeed/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/pitchablespeed/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/pitchablespeed/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -420,9 +429,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/pitchablespeed/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/pitchablespeed/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/pitchablespeed/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/pitchablespeed/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/pitchablespeed/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -437,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53593,8 +56512,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- noatun-plugins/synaescope/Makefile.in
-+++ noatun-plugins/synaescope/Makefile.in
+@@ -763,9 +772,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/pitchablespeed/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/pitchablespeed/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/pitchablespeed/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/pitchablespeed/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/pitchablespeed/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/synaescope/Makefile.in kdeaddons-3.5.5/noatun-plugins/synaescope/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/synaescope/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/synaescope/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -155,6 +155,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -53680,6 +56612,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -422,9 +431,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/synaescope/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/synaescope/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/synaescope/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/synaescope/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -434,9 +443,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/synaescope/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/synaescope/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/synaescope/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/synaescope/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/synaescope/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -451,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53692,17 +56648,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -800,7 +809,7 @@
- -rm -f synaescope.moc cmodule.moc
+@@ -827,9 +836,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/synaescope/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/synaescope/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/synaescope/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/synaescope/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/synaescope/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in syna.h cr16-app-synaescope.png symbol.h font.h cmodule.h synaescope.h Makefile.am polygon.h synaescope.plugin icons.h
-+KDE_DIST=syna.h cr16-app-synaescope.png font.h icons.h synaescope.plugin Makefile.in symbol.h cmodule.h synaescope.h Makefile.am polygon.h
- #>+ 3
- clean-closures:
---- noatun-plugins/tippercanoe/Makefile.in
-+++ noatun-plugins/tippercanoe/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/tippercanoe/Makefile.in kdeaddons-3.5.5/noatun-plugins/tippercanoe/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/tippercanoe/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/tippercanoe/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -152,6 +152,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -53788,6 +56748,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -418,9 +427,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/tippercanoe/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/tippercanoe/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/tippercanoe/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/tippercanoe/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -430,9 +439,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/tippercanoe/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/tippercanoe/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/tippercanoe/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/tippercanoe/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/tippercanoe/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -447,9 +456,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53800,17 +56784,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -785,7 +794,7 @@
- -rm -f synaescope.moc
+@@ -804,9 +813,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/tippercanoe/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/tippercanoe/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/tippercanoe/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/tippercanoe/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/tippercanoe/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in syna.h symbol.h tippecanoe.plugin font.h synaescope.h Makefile.am polygon.h icons.h
-+KDE_DIST=syna.h font.h icons.h Makefile.in symbol.h tippecanoe.plugin synaescope.h Makefile.am polygon.h
- #>+ 3
- clean-closures:
---- noatun-plugins/tyler/Makefile.in
-+++ noatun-plugins/tyler/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/tyler/Makefile.in kdeaddons-3.5.5/noatun-plugins/tyler/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/tyler/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/tyler/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -159,6 +159,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -53896,6 +56884,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -425,9 +434,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/tyler/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/tyler/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/tyler/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/tyler/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -437,9 +446,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/tyler/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/tyler/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/tyler/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/tyler/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/tyler/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -454,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -53908,17 +56920,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -814,7 +823,7 @@
- -rm -f tyler.moc
+@@ -833,9 +842,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/tyler/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/tyler/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/tyler/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/tyler/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/tyler/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in compute.h tyler.plugin tylerstates display.h renderer.h README.Infinity file.h tyler.h Makefile.am main.h
-+KDE_DIST=compute.h display.h README.Infinity file.h main.h Makefile.in tyler.plugin tylerstates renderer.h tyler.h Makefile.am
- #>+ 3
- clean-closures:
---- noatun-plugins/wavecapture/Makefile.in
-+++ noatun-plugins/wavecapture/Makefile.in
+diff -ur kdeaddons-3.5.5.old/noatun-plugins/wavecapture/Makefile.in kdeaddons-3.5.5/noatun-plugins/wavecapture/Makefile.in
+--- kdeaddons-3.5.5.old/noatun-plugins/wavecapture/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/noatun-plugins/wavecapture/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -140,6 +140,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54004,6 +57020,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -404,9 +413,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/wavecapture/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/wavecapture/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign noatun-plugins/wavecapture/Makefile
++#>- $(AUTOMAKE) --gnu noatun-plugins/wavecapture/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -416,9 +425,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/wavecapture/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/wavecapture/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/wavecapture/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/wavecapture/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/wavecapture/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -433,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54016,8 +57056,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- renamedlgplugins/audio/Makefile.in
-+++ renamedlgplugins/audio/Makefile.in
+@@ -754,9 +763,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign noatun-plugins/wavecapture/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu noatun-plugins/wavecapture/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign noatun-plugins/wavecapture/Makefile
++ $(AUTOMAKE) --gnu noatun-plugins/wavecapture/Makefile
+ cd $(top_srcdir) && perl admin/am_edit noatun-plugins/wavecapture/Makefile.in
+
+
+diff -ur kdeaddons-3.5.5.old/renamedlgplugins/audio/Makefile.in kdeaddons-3.5.5/renamedlgplugins/audio/Makefile.in
+--- kdeaddons-3.5.5.old/renamedlgplugins/audio/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/renamedlgplugins/audio/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -138,6 +138,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54103,6 +57156,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -401,9 +410,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign renamedlgplugins/audio/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu renamedlgplugins/audio/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign renamedlgplugins/audio/Makefile
++#>- $(AUTOMAKE) --gnu renamedlgplugins/audio/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -413,9 +422,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign renamedlgplugins/audio/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu renamedlgplugins/audio/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign renamedlgplugins/audio/Makefile
++ $(AUTOMAKE) --gnu renamedlgplugins/audio/Makefile
+ cd $(top_srcdir) && perl admin/am_edit renamedlgplugins/audio/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -430,9 +439,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54115,17 +57192,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -733,7 +742,7 @@
- -rm -f audiopreview.moc
+@@ -752,9 +761,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign renamedlgplugins/audio/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu renamedlgplugins/audio/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign renamedlgplugins/audio/Makefile
++ $(AUTOMAKE) --gnu renamedlgplugins/audio/Makefile
+ cd $(top_srcdir) && perl admin/am_edit renamedlgplugins/audio/Makefile.in
- #>+ 2
--KDE_DIST=renaudiodlg.desktop Makefile.in Makefile.am audiopreview.h
-+KDE_DIST=renaudiodlg.desktop audiopreview.h Makefile.in Makefile.am
- #>+ 3
- clean-closures:
---- renamedlgplugins/images/Makefile.in
-+++ renamedlgplugins/images/Makefile.in
+diff -ur kdeaddons-3.5.5.old/renamedlgplugins/images/Makefile.in kdeaddons-3.5.5/renamedlgplugins/images/Makefile.in
+--- kdeaddons-3.5.5.old/renamedlgplugins/images/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/renamedlgplugins/images/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -140,6 +140,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54211,6 +57292,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -403,9 +412,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign renamedlgplugins/images/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu renamedlgplugins/images/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign renamedlgplugins/images/Makefile
++#>- $(AUTOMAKE) --gnu renamedlgplugins/images/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -415,9 +424,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign renamedlgplugins/images/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu renamedlgplugins/images/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign renamedlgplugins/images/Makefile
++ $(AUTOMAKE) --gnu renamedlgplugins/images/Makefile
+ cd $(top_srcdir) && perl admin/am_edit renamedlgplugins/images/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -432,9 +441,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54223,17 +57328,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -738,7 +747,7 @@
- -rm -f imagevisualizer.moc
+@@ -757,9 +766,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign renamedlgplugins/images/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu renamedlgplugins/images/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign renamedlgplugins/images/Makefile
++ $(AUTOMAKE) --gnu renamedlgplugins/images/Makefile
+ cd $(top_srcdir) && perl admin/am_edit renamedlgplugins/images/Makefile.in
- #>+ 2
--KDE_DIST=Makefile.in renimagedlg.desktop imagevisualizer.h Makefile.am
-+KDE_DIST=renimagedlg.desktop Makefile.in imagevisualizer.h Makefile.am
- #>+ 3
- clean-closures:
---- renamedlgplugins/Makefile.in
-+++ renamedlgplugins/Makefile.in
+diff -ur kdeaddons-3.5.5.old/renamedlgplugins/Makefile.in kdeaddons-3.5.5/renamedlgplugins/Makefile.in
+--- kdeaddons-3.5.5.old/renamedlgplugins/Makefile.in 2006-10-02 19:38:30.000000000 +0200
++++ kdeaddons-3.5.5/renamedlgplugins/Makefile.in 2006-10-10 01:35:02.000000000 +0200
@@ -108,6 +108,7 @@
FFLAGS = @FFLAGS@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
@@ -54319,6 +57428,30 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
+@@ -361,9 +370,9 @@
+ #>- exit 1;; \
+ #>- esac; \
+ #>- done; \
+-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign renamedlgplugins/Makefile'; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu renamedlgplugins/Makefile'; \
+ #>- cd $(top_srcdir) && \
+-#>- $(AUTOMAKE) --foreign renamedlgplugins/Makefile
++#>- $(AUTOMAKE) --gnu renamedlgplugins/Makefile
+ #>+ 12
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -373,9 +382,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign renamedlgplugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu renamedlgplugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign renamedlgplugins/Makefile
++ $(AUTOMAKE) --gnu renamedlgplugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit renamedlgplugins/Makefile.in
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -390,9 +399,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -54331,3 +57464,15 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -694,9 +703,9 @@
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign renamedlgplugins/Makefile'; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu renamedlgplugins/Makefile'; \
+ cd $(top_srcdir) && \
+- $(AUTOMAKE) --foreign renamedlgplugins/Makefile
++ $(AUTOMAKE) --gnu renamedlgplugins/Makefile
+ cd $(top_srcdir) && perl admin/am_edit renamedlgplugins/Makefile.in
+
+
More information about the pkg-kde-commits
mailing list