xref: /OK3568_Linux_fs/yocto/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1From 5539442e5f5442606071afc5cf02642314ad13bb Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed, 17 Aug 2011 22:52:35 +0200
4Subject: [PATCH] tk 8.5.8: import from OE rev
5
6Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
7and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
8installation.
9
10---
11 unix/configure | 1 +
12 unix/tcl.m4    | 2 ++
13 2 files changed, 3 insertions(+)
14
15Index: a/unix/configure
16===================================================================
17--- a/unix/configure.orig
18+++ b/unix/configure
19@@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} d
20 			`ls -d /usr/local/lib 2>/dev/null` \
21 			`ls -d /usr/contrib/lib 2>/dev/null` \
22 			`ls -d /usr/pkg/lib 2>/dev/null` \
23+			`ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
24 			`ls -d /usr/lib/tcl8.6 2>/dev/null` \
25 			`ls -d /usr/lib 2>/dev/null` \
26 			`ls -d /usr/lib64 2>/dev/null` \
27Index: a/unix/tcl.m4
28===================================================================
29--- a/unix/tcl.m4.orig
30+++ b/unix/tcl.m4
31@@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
32 			`ls -d /usr/local/lib 2>/dev/null` \
33 			`ls -d /usr/contrib/lib 2>/dev/null` \
34 			`ls -d /usr/pkg/lib 2>/dev/null` \
35+			`ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
36 			`ls -d /usr/lib/tcl8.6 2>/dev/null` \
37 			`ls -d /usr/lib 2>/dev/null` \
38 			`ls -d /usr/lib64 2>/dev/null` \
39@@ -226,6 +227,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
40 			`ls -d /usr/local/lib 2>/dev/null` \
41 			`ls -d /usr/contrib/lib 2>/dev/null` \
42 			`ls -d /usr/pkg/lib 2>/dev/null` \
43+			`ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
44 			`ls -d /usr/lib/tk8.6 2>/dev/null` \
45 			`ls -d /usr/lib 2>/dev/null` \
46 			`ls -d /usr/lib64 2>/dev/null` \
47