kde-common-PLD.patch

   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
  10
  11    if test -z "$kde_htmldir"; then
  12 -    kde_htmldir='\${datadir}/doc/HTML'
  13 +    kde_htmldir='/usr/share/doc/kde/HTML'
  14    fi
  15    if test -z "$kde_appsdir"; then
  16      kde_appsdir='\${datadir}/applnk'
  17 @@ -4276,32 +4276,11 @@ AC_DEFUN([AC_CHECK_UTMP_FILE],
  18  [
  19      AC_MSG_CHECKING([for utmp file])
  20
  21 -    AC_CACHE_VAL(kde_cv_utmp_file,
  22 -    [
  23 -    kde_cv_utmp_file=no
  24 -
  25 -    for ac_file in    \
  26 -                      \
  27 -       /var/run/utmp \
  28 -       /var/adm/utmp \
  29 -       /etc/utmp     \
  30 -     ; \
  31 -    do
  32 -     if test -r "$ac_file"; then
  33 -       kde_cv_utmp_file=$ac_file
  34 -       break
  35 -     fi
  36 -    done
  37 -    ])
  38 +    AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
  39
  40 -    if test "$kde_cv_utmp_file" != "no"; then
  41 -       AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
  42 -       $1
  43 -       AC_MSG_RESULT($kde_cv_utmp_file)
  44 -    else
  45 -       $2
  46 -       AC_MSG_RESULT([non found])
  47 -    fi
  48 +    AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
  49 +    $1
  50 +    AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
  51  ])
  52
  53
  54 @@ -5078,7 +5057,7 @@ if test "${with_qt_dir+set}" = set; then
  55    kde_qtdir="$with_qt_dir"
  56  fi
  57
  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)
  61
  62  AC_SUBST(QTDOCDIR)