1 Index: kde-common/admin/acinclude.m4.in
2 ===================================================================
3 RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
4 retrieving revision 2.455
5 diff -u -p -r2.455 acinclude.m4.in
6 --- kde-common/admin/acinclude.m4.in 12 May 2004 08:09:31 -0000 2.455
7 +++ kde-common/admin/acinclude.m4.in 3 Jun 2004 10:52:36 -0000
8 @@ -428,7 +428,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
9 if test "$1" = "default"; then
11 if test -z "$kde_htmldir"; then
12 - kde_htmldir='\${datadir}/doc/HTML'
13 + kde_htmldir='/usr/share/doc/kde/HTML'
15 if test -z "$kde_appsdir"; then
16 kde_appsdir='\${datadir}/applnk'
17 @@ -4276,32 +4276,11 @@ AC_DEFUN([AC_CHECK_UTMP_FILE],
19 AC_MSG_CHECKING([for utmp file])
21 - AC_CACHE_VAL(kde_cv_utmp_file,
32 - if test -r "$ac_file"; then
33 - kde_cv_utmp_file=$ac_file
38 + AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
40 - if test "$kde_cv_utmp_file" != "no"; then
41 - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
43 - AC_MSG_RESULT($kde_cv_utmp_file)
46 - AC_MSG_RESULT([non found])
48 + AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
50 + AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
54 @@ -5078,7 +5057,7 @@ if test "${with_qt_dir+set}" = set; then
55 kde_qtdir="$with_qt_dir"
58 -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)
59 +AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
60 AC_MSG_RESULT($QTDOCDIR)