1 diff -urN kdelibs-3.5.3.or/admin/acinclude.m4.in kdelibs-3.5.3/admin/acinclude.m4.in
2 --- kdelibs-3.5.3.or/admin/acinclude.m4.in 2006-05-23 13:02:06.000000000 +0000
3 +++ kdelibs-3.5.3/admin/acinclude.m4.in 2006-07-01 14:55:49.345359250 +0000
5 if test "$1" = "default"; then
7 if test -z "$kde_htmldir"; then
8 - kde_htmldir='\${datadir}/doc/HTML'
9 + kde_htmldir='/usr/share/doc/kde/HTML'
11 if test -z "$kde_appsdir"; then
12 kde_appsdir='\${datadir}/applnk'
13 @@ -2977,41 +2977,6 @@
15 AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
17 - AC_MSG_CHECKING([whether $CC is blacklisted])
19 - dnl In theory we have tu run this test against $CC and $CXX
20 - dnl in C and in C++ mode, because its perfectly legal for
21 - dnl the user to mix compiler versions, since C has a defined
24 - dnl For now, we assume the user is not on crack.
28 -#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
33 - kde_bad_compiler=no,
34 - kde_bad_compiler=yes
37 - AC_MSG_RESULT($kde_bad_compiler)
39 -if test "$kde_bad_compiler" = "yes"; then
42 -This particular compiler version is blacklisted because it
43 -is known to miscompile KDE. Please use a newer version, or
44 -if that is not yet available, choose an older version.
46 -Please do not report a bug or bother us reporting this
47 -configure error. We know about it, and we introduced
48 -it by intention to avoid untraceable bugs or crashes in KDE.
59 - KDE_CHECK_FOR_BAD_COMPILER
61 if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
62 if test "$kde_use_debug_code" != "no"; then
63 if test "$CXX" = "KCC"; then
65 LIBPYTHON=-lpython$version
68 -AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
69 +AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
70 python_moddir=$python_moddir/python$version
71 -if test ! -r $python_moddir/copy.py; then
72 +if test ! -r $python_moddir/copy.pyc; then
76 @@ -4728,32 +4691,11 @@
78 AC_MSG_CHECKING([for utmp file])
80 - AC_CACHE_VAL(kde_cv_utmp_file,
83 + AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
92 - if test -r "$ac_file"; then
93 - kde_cv_utmp_file=$ac_file
99 - if test "$kde_cv_utmp_file" != "no"; then
100 - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
102 - AC_MSG_RESULT($kde_cv_utmp_file)
105 - AC_MSG_RESULT([non found])
107 + AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
109 + AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
113 @@ -5536,7 +5478,7 @@
114 kde_qtdir="$with_qt_dir"
117 -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)
118 +AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
119 AC_MSG_RESULT($QTDOCDIR)