SOURCES: kde-kio-gopher-admin.patch (NEW) - copy of kde-common-PLD...

[glen]

Author: glen                         Date: Sun Dec 30 16:46:50 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- copy of kde-common-PLD.patch r1.3

---- Files affected:
SOURCES:
   kde-kio-gopher-admin.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kde-kio-gopher-admin.patch
diff -u /dev/null SOURCES/kde-kio-gopher-admin.patch:1.1
--- /dev/null	Sun Dec 30 17:46:50 2007
+++ SOURCES/kde-kio-gopher-admin.patch	Sun Dec 30 17:46:45 2007
@@ -0,0 +1,69 @@
+--- kde-common/admin/acinclude.m4.in.orig	2005-03-30 13:39:59.000000000 +0200
++++ kde-common/admin/acinclude.m4.in	2005-04-13 18:34:46.747977880 +0200
+@@ -428,7 +428,7 @@
+ if test "$1" = "default"; then
+ 
+   if test -z "$kde_htmldir"; then
+-    kde_htmldir='\${datadir}/doc/HTML'
++    kde_htmldir='/usr/share/doc/kde/HTML'
+   fi
+   if test -z "$kde_appsdir"; then
+     kde_appsdir='\${datadir}/applnk'
+@@ -4364,9 +4364,9 @@
+   LIBPYTHON=-lpython$version
+ fi
+ 
+-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
++AC_FIND_FILE(python$version/copy.pyc, "/usr/share" , python_moddir)
+ python_moddir=$python_moddir/python$version
+-if test ! -r $python_moddir/copy.py; then
++if test ! -r $python_moddir/copy.pyc; then
+   python_moddir=no
+ fi
+ 
+@@ -4513,32 +4513,11 @@
+ [
+     AC_MSG_CHECKING([for utmp file])
+ 
+-    AC_CACHE_VAL(kde_cv_utmp_file,
+-    [
+-    kde_cv_utmp_file=no
+-
+-    for ac_file in    \
+-                      \
+-	/var/run/utmp \
+-	/var/adm/utmp \
+-	/etc/utmp     \
+-     ; \
+-    do
+-     if test -r "$ac_file"; then
+-       kde_cv_utmp_file=$ac_file
+-       break
+-     fi
+-    done
+-    ])
++    AC_CACHE_VAL(kde_cv_utmp_file, [kde_cv_utmp_file=/var/run/utmpx])
+ 
+-    if test "$kde_cv_utmp_file" != "no"; then
+-	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
+-	$1
+-	AC_MSG_RESULT($kde_cv_utmp_file)
+-    else
+-    	$2
+-	AC_MSG_RESULT([non found])
+-    fi
++    AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
++    $1
++    AC_MSG_RESULT(We are using $kde_cv_utmp_file in PLD instead.)
+ ])
+ 
+ 
+@@ -5321,7 +5300,7 @@
+   kde_qtdir="$with_qt_dir"
+ fi
+ 
+-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)
++AC_FIND_FILE(qsql.html, [ /usr/share/doc/qt-doc/html ], QTDOCDIR)
+ AC_MSG_RESULT($QTDOCDIR)
+ 
+ AC_SUBST(QTDOCDIR)
================================================================