kde-common-PLD.patch

   1 --- kde-common/admin/acinclude.m4.in.2.455      2004-06-01 13:50:00.863844064 +0200
   2 +++ kde-common/admin/acinclude.m4.in    2004-06-01 13:49:21.877770848 +0200
   3 @@ -428,7 +428,7 @@
   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'
  12 @@ -4276,32 +4276,11 @@
  13  [
  14      AC_MSG_CHECKING([for utmp file])
  15
  16 -    AC_CACHE_VAL(kde_cv_utmp_file,
  17 -    [
  18 -    kde_cv_utmp_file=no
  19 -
  20 -    for ac_file in    \
  21 -                      \
  22 -       /var/run/utmp \
  23 -       /var/adm/utmp \
  24 -       /etc/utmp     \
  25 -     ; \
  26 -    do
  27 -     if test -r "$ac_file"; then
  28 -       kde_cv_utmp_file=$ac_file
  29 -       break
  30 -     fi
  31 -    done
  32 -    ])
  33 +    AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
  34
  35 -    if test "$kde_cv_utmp_file" != "no"; then
  36 -       AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
  37 -       $1
  38 -       AC_MSG_RESULT($kde_cv_utmp_file)
  39 -    else
  40 -       $2
  41 -       AC_MSG_RESULT([non found])
  42 -    fi
  43 +    AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
  44 +    $1
  45 +    AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
  46  ])
  47
  48
  49 @@ -5078,7 +5057,7 @@
  50    kde_qtdir="$with_qt_dir"
  51  fi
  52
  53 -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)
  54 +AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
  55  AC_MSG_RESULT($QTDOCDIR)
  56
  57  AC_SUBST(QTDOCDIR)