confsearch.diff 1.7 KB

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