1 --- amarok/admin/acinclude.m4.in.orig 2005-05-03 16:39:47.000000000 +0200
2 +++ amarok/admin/acinclude.m4.in 2005-05-03 17:18:15.629229288 +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 @@ -2909,46 +2909,6 @@
16 -AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
18 - AC_MSG_CHECKING([whether $CC is blacklisted])
20 - dnl In theory we have tu run this test against $CC and $CXX
21 - dnl in C and in C++ mode, because its perfectly legal for
22 - dnl the user to mix compiler versions, since C has a defined
25 - dnl For now, we assume the user is not on crack.
29 -#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
34 - kde_bad_compiler=no,
35 - kde_bad_compiler=yes
38 - AC_MSG_RESULT($kde_bad_compiler)
40 -if test "$kde_bad_compiler" = "yes"; then
43 -This particular compiler version is blacklisted because it
44 -is known to miscompile KDE. Please use a newer version, or
45 -if that is not yet available, choose an older version.
47 -Please do not report a bug or bother us reporting this
48 -configure error. We know about it, and we introduced
49 -it by intention to avoid untraceable bugs or crashes in KDE.
56 dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
57 AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
63 - KDE_CHECK_FOR_BAD_COMPILER
65 if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
66 if test "$kde_use_debug_code" != "no"; then
67 if test "$CXX" = "KCC"; then
69 LIBPYTHON=-lpython$version
72 -AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
73 +AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
74 python_moddir=$python_moddir/python$version
75 -if test ! -r $python_moddir/copy.py; then
76 +if test ! -r $python_moddir/copy.pyc; then
80 @@ -4551,32 +4509,11 @@
82 AC_MSG_CHECKING([for utmp file])
84 - AC_CACHE_VAL(kde_cv_utmp_file,
87 + AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
96 - if test -r "$ac_file"; then
97 - kde_cv_utmp_file=$ac_file
103 - if test "$kde_cv_utmp_file" != "no"; then
104 - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
106 - AC_MSG_RESULT($kde_cv_utmp_file)
109 - AC_MSG_RESULT([non found])
111 + AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
113 + AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
117 @@ -5359,7 +5296,7 @@
118 kde_qtdir="$with_qt_dir"
121 -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)
122 +AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
123 AC_MSG_RESULT($QTDOCDIR)