-diff -urN kdelibs-3.5.3.or/admin/acinclude.m4.in kdelibs-3.5.3/admin/acinclude.m4.in
--- kdelibs-3.5.3.or/admin/acinclude.m4.in 2006-05-23 13:02:06.000000000 +0000
+++ kdelibs-3.5.3/admin/acinclude.m4.in 2006-07-01 14:55:49.345359250 +0000
@@ -428,7 +428,7 @@
AC_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR)
-
+--- kdelibs-3.5.4/admin/am_edit 2006-07-24 10:18:33.000000000 +0300
++++ gwenview-1.4.0/admin/am_edit 2006-09-25 00:04:55.213036950 +0300
+@@ -499,6 +499,11 @@
+ }
+ }
+
++ $lookup = '(CXXLINK = \$\(LIBTOOL\) --mode=link --tag=CXX) \$\(CXXLD\)';
++ if ($MakefileData =~ m/$lookup/) {
++ substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
++ }
++
+ $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
+
+ $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
+@@ -578,6 +583,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) {