#
# 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)
ef='/cgit/multitech-oe.git/tree/packages/python/python-imaging_1.1.6.bb?h=testing&amp;id=3ce30387a6a954e4c51374c5f7a32813ab1a816b'>tree</a><a href='/cgit/multitech-oe.git/commit/packages/python/python-imaging_1.1.6.bb?h=testing&amp;id=3ce30387a6a954e4c51374c5f7a32813ab1a816b'>commit</a><a href='/cgit/multitech-oe.git/diff/packages/python/python-imaging_1.1.6.bb?h=testing&amp;id=3ce30387a6a954e4c51374c5f7a32813ab1a816b'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/python/python-imaging_1.1.6.bb'>
<input type='hidden' name='h' value='testing'/><input type='hidden' name='id' value='3ce30387a6a954e4c51374c5f7a32813ab1a816b'/><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/?h=testing&amp;id=3ce30387a6a954e4c51374c5f7a32813ab1a816b'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?h=testing&amp;id=3ce30387a6a954e4c51374c5f7a32813ab1a816b'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/python?h=testing&amp;id=3ce30387a6a954e4c51374c5f7a32813ab1a816b'>python</a>/<a href='/cgit/multitech-oe.git/log/packages/python/python-imaging_1.1.6.bb?h=testing&amp;id=3ce30387a6a954e4c51374c5f7a32813ab1a816b'>python-imaging_1.1.6.bb</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/python/python-imaging_1.1.6.bb?h=testing&amp;id=3ce30387a6a954e4c51374c5f7a32813ab1a816b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr><td><span title='2008-10-18 18:02:07 +0200'>2008-10-18</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/python/python-imaging_1.1.6.bb?h=testing&amp;id=c0b6dd9b41279ff00c5a90e49108945a0fee9cdd'>bb files: Revert the introduction of FILE_PR</a></td><td>Holger Hans Peter Freyther</td><td>1</td></tr>
<tr><td><span title='2008-10-15 21:41:43 +0200'>2008-10-15</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/python/python-imaging_1.1.6.bb?h=testing&amp;id=aa03004ace2fabb135a6208ef8c2d2b312aa7b0b'>[PR] Change PR to FILE_PR and intro PR as FILE_PR + DISTRO_PR</a></td><td>Holger Hans Peter Freyther</td><td>1</td></tr>
<tr><td><span title='2007-08-16 13:09:27 +0000'>2007-08-16</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/python/python-imaging_1.1.6.bb?h=testing&amp;id=966fc3fc63539a0cbedc0de1bc5284aea0bda2ad'>python-imaging: update to 1.1.6</a></td><td>Michael Lauer</td><td>1</td></tr>