1 --- kdelibs-3.5.3.or/admin/acinclude.m4.in 2006-05-23 13:02:06.000000000 +0000
2 +++ kdelibs-3.5.3/admin/acinclude.m4.in 2006-07-01 14:55:49.345359250 +0000
4 if test "$1" = "default"; then
6 if test -z "$kde_htmldir"; then
7 - kde_htmldir='\${datadir}/doc/HTML'
8 + kde_htmldir='/usr/share/doc/kde/HTML'
10 if test -z "$kde_appsdir"; then
11 kde_appsdir='\${datadir}/applnk'
12 @@ -2977,41 +2977,6 @@
14 AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
16 - AC_MSG_CHECKING([whether $CC is blacklisted])
18 - dnl In theory we have tu run this test against $CC and $CXX
19 - dnl in C and in C++ mode, because its perfectly legal for
20 - dnl the user to mix compiler versions, since C has a defined
23 - dnl For now, we assume the user is not on crack.
27 -#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
32 - kde_bad_compiler=no,
33 - kde_bad_compiler=yes
36 - AC_MSG_RESULT($kde_bad_compiler)
38 -if test "$kde_bad_compiler" = "yes"; then
41 -This particular compiler version is blacklisted because it
42 -is known to miscompile KDE. Please use a newer version, or
43 -if that is not yet available, choose an older version.
45 -Please do not report a bug or bother us reporting this
46 -configure error. We know about it, and we introduced
47 -it by intention to avoid untraceable bugs or crashes in KDE.
58 - KDE_CHECK_FOR_BAD_COMPILER
60 if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
61 if test "$kde_use_debug_code" != "no"; then
62 if test "$CXX" = "KCC"; then
64 LIBPYTHON=-lpython$version
67 -AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
68 +AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
69 python_moddir=$python_moddir/python$version
70 -if test ! -r $python_moddir/copy.py; then
71 +if test ! -r $python_moddir/copy.pyc; then
75 @@ -4728,32 +4691,11 @@
77 AC_MSG_CHECKING([for utmp file])
79 - AC_CACHE_VAL(kde_cv_utmp_file,
82 + AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
91 - if test -r "$ac_file"; then
92 - kde_cv_utmp_file=$ac_file
98 - if test "$kde_cv_utmp_file" != "no"; then
99 - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
101 - AC_MSG_RESULT($kde_cv_utmp_file)
104 - AC_MSG_RESULT([non found])
106 + AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
108 + AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
112 @@ -5536,7 +5478,7 @@
113 kde_qtdir="$with_qt_dir"
116 -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
117 +AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
118 AC_MSG_RESULT($QTDOCDIR)
121 --- gwenview-1.4.0/admin/am_edit 2006-09-25 00:04:55.213036950 +0300
122 +++ kdelibs-3.5.5/admin/am_edit 2006-10-03 11:40:08.052152886 +0300
127 + $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CXXLD\)';
128 + if ($MakefileData =~ m/$lookup/) {
129 + substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
131 + $lookup = '(LINK = \$\(LIBTOOL\).*--mode=link.*) \$\(CCLD\)';
132 + if ($MakefileData =~ m/$lookup/) {
133 + substituteLine($lookup, "$1 \"\$\(CCLD\)\"");
136 $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
138 $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
140 local @kde_options = split(/[\034\s]+/, $kde_options_str);
141 if (grep(/^foreign$/, @kde_options)) {
142 push(@foreignfiles, $makefileDir . "/");
144 + # always do this. don't care if it's foreign file. we *need* CXXLD quoted for libtool argument.
145 + $lookup = '(CXXLINK = \$\(LIBTOOL\).*--mode=link) \$\(CXXLD\)';
146 + if ($MakefileData =~ m/$lookup/) {
147 + substituteLine($lookup, "$1 \"\$\(CXXLD\)\"");
151 return 0; # don't touch me
153 for $opt (@kde_options) {
155 --- x/admin/acinclude.m4.in.orig 2008-10-08 10:18:48.844247699 +0200
156 +++ x/admin/acinclude.m4.in 2008-10-08 10:21:26.884232831 +0200
157 @@ -4612,7 +4612,8 @@
159 AC_DEFUN([KDE_CHECK_PYTHON],
161 - KDE_CHECK_PYTHON_INTERN("2.5",
162 + KDE_CHECK_PYTHON_INTERN("2.6",
163 + [KDE_CHECK_PYTHON_INTERN("2.5",
164 [KDE_CHECK_PYTHON_INTERN("2.4",
165 [KDE_CHECK_PYTHON_INTERN("2.3",
166 [KDE_CHECK_PYTHON_INTERN("2.2",
167 @@ -4624,6 +4625,7 @@
174 AC_DEFUN([KDE_CHECK_STL],