AC_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR)
-
---- kdelibs-3.5.4/admin/am_edit 2006-07-24 10:18:33.000000000 +0300
-+++ kdepim-3.5.4/admin/am_edit 2006-09-19 14:20:21.446444147 +0300
-@@ -499,6 +498,11 @@
+--- gwenview-1.4.0/admin/am_edit 2006-09-25 00:04:55.213036950 +0300
++++ kdelibs-3.5.5/admin/am_edit 2006-10-03 11:40:08.052152886 +0300
+@@ -499,6 +499,15 @@
}
}
-+ $lookup = '(CXXLINK = \$\(LIBTOOL\) --tag=CXX --mode=link) \$\(CXXLD\)';
++ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
+ if ($MakefileData =~ m/$lookup/) {
+ substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
+ }
++ $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
++ if ($MakefileData =~ m/$lookup/) {
++ substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
++ }
+
$MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
$lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
+@@ -578,6 +587,14 @@
+ local @kde_options = split(/[\034\s]+/, $kde_options_str);
+ if (grep(/^foreign$/, @kde_options)) {
+ push(@foreignfiles, $makefileDir . "/");
++
++ # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument.
++ $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)';
++ if ($MakefileData =~ m/$lookup/) {
++ substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
++ updateMakefile ();
++ }
++
+ return 0; # don't touch me
+ }
+ for $opt (@kde_options) {
+
+--- x/admin/acinclude.m4.in.orig 2008-10-08 10:18:48.844247699 +0200
++++ x/admin/acinclude.m4.in 2008-10-08 10:21:26.884232831 +0200
+@@ -4612,7 +4612,8 @@
+
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+- KDE_CHECK_PYTHON_INTERN("2.5",
++ KDE_CHECK_PYTHON_INTERN("2.6",
++ [KDE_CHECK_PYTHON_INTERN("2.5",
+ [KDE_CHECK_PYTHON_INTERN("2.4",
+ [KDE_CHECK_PYTHON_INTERN("2.3",
+ [KDE_CHECK_PYTHON_INTERN("2.2",
+@@ -4624,6 +4625,7 @@
+ ])
+ ])
+ ])
++ ])
+ ])
+
+ AC_DEFUN([KDE_CHECK_STL],