blob: 229acf3e7a36f55757faf53776796781a0122209 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 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
Patrick Williamsb48b7b42016-08-17 15:04:38 -05006Patch 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
Brad Bishop19323692019-04-05 15:28:33 -040010---
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
Brad Bishope42b3e32020-01-15 22:08:42 -050019@@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} d
Brad Bishop316dfdd2018-06-25 12:45:53 -040020 `ls -d /usr/local/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040021 `ls -d /usr/contrib/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040022 `ls -d /usr/pkg/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040023+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
Brad Bishope42b3e32020-01-15 22:08:42 -050024 `ls -d /usr/lib/tcl8.6 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050025 `ls -d /usr/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040026 `ls -d /usr/lib64 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040027Index: a/unix/tcl.m4
28===================================================================
29--- a/unix/tcl.m4.orig
30+++ b/unix/tcl.m4
Brad Bishope42b3e32020-01-15 22:08:42 -050031@@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
Brad Bishop316dfdd2018-06-25 12:45:53 -040032 `ls -d /usr/local/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040033 `ls -d /usr/contrib/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040034 `ls -d /usr/pkg/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040035+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
Brad Bishope42b3e32020-01-15 22:08:42 -050036 `ls -d /usr/lib/tcl8.6 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050037 `ls -d /usr/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040038 `ls -d /usr/lib64 2>/dev/null` \
Brad Bishope42b3e32020-01-15 22:08:42 -050039@@ -226,6 +227,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
Patrick Williamsb48b7b42016-08-17 15:04:38 -050040 `ls -d /usr/local/lib 2>/dev/null` \
41 `ls -d /usr/contrib/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040042 `ls -d /usr/pkg/lib 2>/dev/null` \
Brad Bishope42b3e32020-01-15 22:08:42 -050043+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
44 `ls -d /usr/lib/tk8.6 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050045 `ls -d /usr/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040046 `ls -d /usr/lib64 2>/dev/null` \