From: djurban <djurban@pld-linux.org>
Date: Sat, 16 Apr 2005 12:09:42 +0000 (+0000)
Subject: - fix python search
X-Git-Tag: auto/ac/kdebase-3_4_0-4
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fakode.git;a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fac%2Fkdebase-3_4_0-4

- fix python search

Changed files:
    kde-common-PLD.patch -> 1.3
---

diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 94a2df1..fd9416e 100644
--- a/kde-common-PLD.patch
+++ b/kde-common-PLD.patch
@@ -1,11 +1,6 @@
-Index: kde-common/admin/acinclude.m4.in
-===================================================================
-RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
-retrieving revision 2.455
-diff -u -p -r2.455 acinclude.m4.in
---- kde-common/admin/acinclude.m4.in	12 May 2004 08:09:31 -0000	2.455
-+++ kde-common/admin/acinclude.m4.in	3 Jun 2004 10:52:36 -0000
-@@ -428,7 +428,7 @@ AC_DEFUN([KDE_SET_DEFAULT_PATHS],
+--- 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
@@ -14,7 +9,19 @@ diff -u -p -r2.455 acinclude.m4.in
    fi
    if test -z "$kde_appsdir"; then
      kde_appsdir='\${datadir}/applnk'
-@@ -4276,32 +4276,11 @@ AC_DEFUN([AC_CHECK_UTMP_FILE],
+@@ -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])
  
@@ -51,7 +58,7 @@ diff -u -p -r2.455 acinclude.m4.in
  ])
  
  
-@@ -5078,7 +5057,7 @@ if test "${with_qt_dir+set}" = set; then
+@@ -5321,7 +5300,7 @@
    kde_qtdir="$with_qt_dir"
  fi