1 --- kde-common/admin/acinclude.m4.in.orig 2005-03-30 13:39:59.000000000 +0200
2 +++ kde-common/admin/acinclude.m4.in 2005-04-13 18:34:46.747977880 +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'
13 LIBPYTHON=-lpython$version
16 -AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
17 +AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
18 python_moddir=$python_moddir/python$version
19 -if test ! -r $python_moddir/copy.py; then
20 +if test ! -r $python_moddir/copy.pyc; then
24 @@ -4513,32 +4513,11 @@
26 AC_MSG_CHECKING([for utmp file])
28 - AC_CACHE_VAL(kde_cv_utmp_file,
39 - if test -r "$ac_file"; then
40 - kde_cv_utmp_file=$ac_file
45 + AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
47 - if test "$kde_cv_utmp_file" != "no"; then
48 - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
50 - AC_MSG_RESULT($kde_cv_utmp_file)
53 - AC_MSG_RESULT([non found])
55 + AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
57 + AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
62 kde_qtdir="$with_qt_dir"
65 -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)
66 +AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
67 AC_MSG_RESULT($QTDOCDIR)