1 --- amaroc/admin/acinclude.m4.in.orig 2006-04-03 18:02:49.000000000 +0200
2 +++ amaroc/admin/acinclude.m4.in 2006-04-03 18:20:39.000000000 +0200
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 @@ -2974,48 +2974,6 @@
17 -AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
19 - AC_MSG_CHECKING([whether $CC is blacklisted])
21 - dnl In theory we have tu run this test against $CC and $CXX
22 - dnl in C and in C++ mode, because its perfectly legal for
23 - dnl the user to mix compiler versions, since C has a defined
26 - dnl For now, we assume the user is not on crack.
30 -#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
35 - kde_bad_compiler=no,
36 - kde_bad_compiler=yes
39 - AC_MSG_RESULT($kde_bad_compiler)
41 -if test "$kde_bad_compiler" = "yes"; then
44 -This particular compiler version is blacklisted because it
45 -is known to miscompile KDE. Please use a newer version, or
46 -if that is not yet available, choose an older version.
48 -Please do not report a bug or bother us reporting this
49 -configure error. We know about it, and we introduced
50 -it by intention to avoid untraceable bugs or crashes in KDE.
58 AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
60 AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
65 - KDE_CHECK_FOR_BAD_COMPILER
67 if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
68 if test "$kde_use_debug_code" != "no"; then
69 if test "$CXX" = "KCC"; then
71 LIBPYTHON=-lpython$version
74 -AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
75 +AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
76 python_moddir=$python_moddir/python$version
77 -if test ! -r $python_moddir/copy.py; then
78 +if test ! -r $python_moddir/copy.pyc; then
82 @@ -4725,32 +4681,11 @@
84 AC_MSG_CHECKING([for utmp file])
86 - AC_CACHE_VAL(kde_cv_utmp_file,
97 - if test -r "$ac_file"; then
98 - kde_cv_utmp_file=$ac_file
103 + AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
105 - if test "$kde_cv_utmp_file" != "no"; then
106 - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
108 - AC_MSG_RESULT($kde_cv_utmp_file)
111 - AC_MSG_RESULT([non found])
113 + AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
115 + AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
119 @@ -5533,7 +5468,7 @@
120 kde_qtdir="$with_qt_dir"
123 -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)
124 +AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
125 AC_MSG_RESULT($QTDOCDIR)