]>
Commit | Line | Data |
---|---|---|
8479bfaf | 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 | |
3 | @@ -428,7 +428,7 @@ | |
950fc284 | 4 | if test "$1" = "default"; then |
5 | ||
6 | if test -z "$kde_htmldir"; then | |
7 | - kde_htmldir='\${datadir}/doc/HTML' | |
8 | + kde_htmldir='/usr/share/doc/kde/HTML' | |
9 | fi | |
10 | if test -z "$kde_appsdir"; then | |
11 | kde_appsdir='\${datadir}/applnk' | |
8479bfaf | 12 | @@ -4364,9 +4364,9 @@ |
13 | LIBPYTHON=-lpython$version | |
14 | fi | |
15 | ||
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 | |
21 | python_moddir=no | |
22 | fi | |
23 | ||
24 | @@ -4513,32 +4513,11 @@ | |
950fc284 | 25 | [ |
26 | AC_MSG_CHECKING([for utmp file]) | |
27 | ||
28 | - AC_CACHE_VAL(kde_cv_utmp_file, | |
29 | - [ | |
30 | - kde_cv_utmp_file=no | |
31 | - | |
32 | - for ac_file in \ | |
33 | - \ | |
34 | - /var/run/utmp \ | |
35 | - /var/adm/utmp \ | |
36 | - /etc/utmp \ | |
37 | - ; \ | |
38 | - do | |
39 | - if test -r "$ac_file"; then | |
40 | - kde_cv_utmp_file=$ac_file | |
41 | - break | |
42 | - fi | |
43 | - done | |
44 | - ]) | |
45 | + AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx]) | |
46 | ||
47 | - if test "$kde_cv_utmp_file" != "no"; then | |
48 | - AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) | |
49 | - $1 | |
50 | - AC_MSG_RESULT($kde_cv_utmp_file) | |
51 | - else | |
52 | - $2 | |
53 | - AC_MSG_RESULT([non found]) | |
54 | - fi | |
55 | + AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries]) | |
56 | + $1 | |
57 | + AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.) | |
58 | ]) | |
59 | ||
60 | ||
8479bfaf | 61 | @@ -5321,7 +5300,7 @@ |
950fc284 | 62 | kde_qtdir="$with_qt_dir" |
63 | fi | |
64 | ||
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) | |
68 | ||
69 | AC_SUBST(QTDOCDIR) |