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