117724f21a94ff32f773af4c37be88fe0d2970e3~suv--- setup.py.orig 2008-10-16 12:58:19.000000000 -0600
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+++ setup.py 2009-06-07 20:55:17.000000000 -0600
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -609,7 +609,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # a release. Most open source OSes come with one or more
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # versions of BerkeleyDB already installed.
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- max_db_ver = (4, 5)
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+ max_db_ver = (4, 6)
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # we leave that version disabled by default as it has proven to be
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # quite a buggy library release on many platforms.
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -636,6 +636,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # 3.x minor number specific paths
117724f21a94ff32f773af4c37be88fe0d2970e3~suv for x in (3,):
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -711,6 +712,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # check lib directories parallel to the location of the header
117724f21a94ff32f773af4c37be88fe0d2970e3~suv db_dirs_to_check = [
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+ os.path.join('__PREFIX__', 'lib', 'db46'),
117724f21a94ff32f773af4c37be88fe0d2970e3~suv os.path.join(db_incdir, '..', 'lib64'),
117724f21a94ff32f773af4c37be88fe0d2970e3~suv os.path.join(db_incdir, '..', 'lib'),
117724f21a94ff32f773af4c37be88fe0d2970e3~suv os.path.join(db_incdir, '..', '..', 'lib64'),
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -1212,13 +1214,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv def detect_tkinter(self, inc_dirs, lib_dirs):
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # The _tkinter module.
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- # Rather than complicate the code below, detecting and building
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- # AquaTk is a separate method. Only one Tkinter will be built on
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- # Darwin - either AquaTk, if it is found, or X11 based Tk.
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- if (platform == 'darwin' and
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # Assume we haven't found any of the libraries or include files
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # The versions with dots are used on Unix, and the versions without
117724f21a94ff32f773af4c37be88fe0d2970e3~suv--- setup.py.orig 2009-09-10 19:41:32.000000000 +1000
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+++ setup.py 2009-09-10 19:48:30.000000000 +1000
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -1197,7 +1197,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # For 8.4a2, the X11 headers are not included. Rather than include a
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # complicated search, this is a hard-coded path. It could bail out
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # if X11 libs are not found...
117724f21a94ff32f773af4c37be88fe0d2970e3~suv frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
117724f21a94ff32f773af4c37be88fe0d2970e3~suv ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -1262,17 +1262,17 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if platform == 'sunos5':
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # Assume default location for X11
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # If Cygwin, then verify that X is installed before proceeding
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if platform == 'cygwin':