]>
Commit | Line | Data |
---|---|---|
c02013c5 AM |
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 | |
8555f791 | 4 | @@ -428,7 +428,7 @@ |
287009f5 | 5 | if test "$1" = "default"; then |
6 | ||
7 | if test -z "$kde_htmldir"; then | |
8 | - kde_htmldir='\${datadir}/doc/HTML' | |
9 | + kde_htmldir='/usr/share/doc/kde/HTML' | |
10 | fi | |
11 | if test -z "$kde_appsdir"; then | |
12 | kde_appsdir='\${datadir}/applnk' | |
c02013c5 | 13 | @@ -2977,41 +2977,6 @@ |
3fb8e408 AM |
14 | |
15 | AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER], | |
16 | [ | |
17 | - AC_MSG_CHECKING([whether $CC is blacklisted]) | |
18 | - | |
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 | |
22 | - dnl ABI. | |
23 | - dnl | |
24 | - dnl For now, we assume the user is not on crack. | |
25 | - | |
26 | - AC_TRY_COMPILE([ | |
27 | -#ifdef __GNUC__ | |
28 | -#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0 | |
29 | -choke me | |
30 | -#endif | |
31 | -#endif | |
32 | -], , | |
33 | - kde_bad_compiler=no, | |
34 | - kde_bad_compiler=yes | |
35 | -) | |
36 | - | |
37 | - AC_MSG_RESULT($kde_bad_compiler) | |
38 | - | |
39 | -if test "$kde_bad_compiler" = "yes"; then | |
40 | - AC_MSG_ERROR([ | |
41 | - | |
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. | |
45 | - | |
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. | |
49 | - | |
50 | -]) | |
51 | -fi | |
52 | ||
53 | ]) | |
54 | ||
c02013c5 | 55 | @@ -3153,8 +3118,6 @@ |
3fb8e408 AM |
56 | |
57 | AC_PROG_CXX | |
58 | ||
59 | - KDE_CHECK_FOR_BAD_COMPILER | |
60 | - | |
61 | if test "$GXX" = "yes" || test "$CXX" = "KCC"; then | |
62 | if test "$kde_use_debug_code" != "no"; then | |
63 | if test "$CXX" = "KCC"; then | |
c02013c5 | 64 | @@ -4579,9 +4542,9 @@ |
8555f791 | 65 | LIBPYTHON=-lpython$version |
66 | fi | |
67 | ||
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 | |
73 | python_moddir=no | |
74 | fi | |
75 | ||
c02013c5 | 76 | @@ -4728,32 +4691,11 @@ |
287009f5 | 77 | [ |
78 | AC_MSG_CHECKING([for utmp file]) | |
79 | ||
80 | - AC_CACHE_VAL(kde_cv_utmp_file, | |
81 | - [ | |
82 | - kde_cv_utmp_file=no | |
3fb8e408 AM |
83 | + AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx]) |
84 | ||
287009f5 | 85 | - for ac_file in \ |
86 | - \ | |
87 | - /var/run/utmp \ | |
88 | - /var/adm/utmp \ | |
89 | - /etc/utmp \ | |
90 | - ; \ | |
91 | - do | |
92 | - if test -r "$ac_file"; then | |
93 | - kde_cv_utmp_file=$ac_file | |
94 | - break | |
95 | - fi | |
96 | - done | |
97 | - ]) | |
3fb8e408 | 98 | - |
287009f5 | 99 | - if test "$kde_cv_utmp_file" != "no"; then |
100 | - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) | |
101 | - $1 | |
102 | - AC_MSG_RESULT($kde_cv_utmp_file) | |
103 | - else | |
104 | - $2 | |
105 | - AC_MSG_RESULT([non found]) | |
106 | - fi | |
107 | + AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) | |
108 | + $1 | |
109 | + AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.) | |
110 | ]) | |
111 | ||
112 | ||
c02013c5 | 113 | @@ -5536,7 +5478,7 @@ |
287009f5 | 114 | kde_qtdir="$with_qt_dir" |
115 | fi | |
116 | ||
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) | |
120 | ||
121 | AC_SUBST(QTDOCDIR) | |
e36eaf27 | 122 |