#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- Python-2.4.1/setup.py~fix-tkinter-detection
+++ Python-2.4.1/setup.py
@@ -999,7 +999,7 @@
                 dotversion = dotversion[:-1] + '.' + dotversion[-1]
             tcl_include_sub = []
             tk_include_sub = []
-            for dir in inc_dirs:
+            for dir in [os.getenv("STAGING_INCDIR")]:
                 tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
                 tk_include_sub += [dir + os.sep + "tk" + dotversion]
             tk_include_sub += tcl_include_sub
@@ -1018,22 +1018,6 @@
             if dir not in include_dirs:
                 include_dirs.append(dir)
 
-        # Check for various platform-specific directories
-        if platform == 'sunos5':
-            include_dirs.append('/usr/openwin/include')
-            added_lib_dirs.append('/usr/openwin/lib')
-        elif os.path.exists('/usr/X11R6/include'):
-            include_dirs.append('/usr/X11R6/include')
-            added_lib_dirs.append('/usr/X11R6/lib64')
-            added_lib_dirs.append('/usr/X11R6/lib')
-        elif os.path.exists('/usr/X11R5/include'):
-            include_dirs.append('/usr/X11R5/include')
-            added_lib_dirs.append('/usr/X11R5/lib')
-        else:
-            # Assume default location for X11
-            include_dirs.append('/usr/X11/include')
-            added_lib_dirs.append('/usr/X11/lib')
-
         # If Cygwin, then verify that X is installed before proceeding
         if platform == 'cygwin':
             x11_inc = find_file('X11/Xlib.h', [], include_dirs)
5e9f21f516419f5675390'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/litestream?id=ce990bd80f75f0d33d15e9f21f516419f5675390'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/litestream?id=ce990bd80f75f0d33d15e9f21f516419f5675390'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/litestream'>
<input type='hidden' name='id' value='ce990bd80f75f0d33d15e9f21f516419f5675390'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/multitech-oe.git/log/?id=ce990bd80f75f0d33d15e9f21f516419f5675390'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=ce990bd80f75f0d33d15e9f21f516419f5675390'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/litestream?id=ce990bd80f75f0d33d15e9f21f516419f5675390'>litestream</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit/multitech-oe.git/log/packages/litestream?id=ce990bd80f75f0d33d15e9f21f516419f5675390&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
4 10:36:03 +0000'>2006-01-04</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/libeina?id=bcf39886ed42157c9b5ed692c36014f4fe74168c'>Revert the changes from revisions 65af73a95a851d2e8c3cf2f523f1acc488be0208, 2...</a></td><td>Richard Purdie</td><td>2</td></tr>
<tr><td><span title='2006-01-02 13:16:14 +0000'>2006-01-02</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/libeina?id=ed5dc96cce94e07c31c681ae470b73fd6fb51b2b'>autotooled packages: remove custom do_stage</a></td><td>Philipp Zabel</td><td>2</td></tr>
<tr><td><span title='2005-11-16 12:13:36 +0000'>2005-11-16</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/libeina?id=7df1a01dad4cd9c95ffab7fca3f6207dff52f98b'>LICENSE is spelt with an S in OE. Change LICENCE -&gt; LICENSE</a></td><td>Richard Purdie</td><td>2</td></tr>
<tr><td><span title='2005-10-13 15:02:03 +0000'>2005-10-13</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/libeina?id=781484455363feb1c9e21c0c19571620749981fa'>libeina: add patch to remove libmagic dep from 0.96.7</a></td><td>Koen Kooi</td><td>3</td></tr>
<tr><td><span title='2005-10-12 12:35:10 +0000'>2005-10-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/libeina?id=4f8a03c9b48e9c472eba3d035f13ad6298eb2ba8'>libeina: fix typo in 0.96.7</a></td><td>Koen Kooi</td><td>1</td></tr>
<tr><td><span title='2005-10-11 22:29:57 +0000'>2005-10-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/libeina?id=9a475e346c8b04d98a7b28e32537a4820943ac2d'>libeina: update to 0.96.7</a></td><td>Koen Kooi</td><td>1</td></tr>
<tr><td><span title='2005-10-11 22:24:57 +0000'>2005-10-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/libeina?id=752a5a1581bb1e3b76fd591f3bf2d0dae8d165e4'>libeina: add 0.96.5</a></td><td>Koen Kooi</td><td>2</td></tr>