|
Lines 1-5
Link Here
|
| 1 |
--- setupext.py.orig 2010-07-28 11:18:08.000000000 -0400 |
1 |
--- setupext.py.orig 2010-07-07 09:41:55.000000000 +0800 |
| 2 |
+++ setupext.py 2010-07-28 11:21:02.000000000 -0400 |
2 |
+++ setupext.py 2011-06-27 16:14:58.000000000 +0800 |
| 3 |
@@ -68,6 +68,9 @@ |
3 |
@@ -68,6 +68,9 @@ |
| 4 |
'freebsd4' : ['/usr/local', '/usr'], |
4 |
'freebsd4' : ['/usr/local', '/usr'], |
| 5 |
'freebsd5' : ['/usr/local', '/usr'], |
5 |
'freebsd5' : ['/usr/local', '/usr'], |
|
Lines 13-34
Link Here
|
| 13 |
@@ -789,7 +792,7 @@ |
13 |
@@ -789,7 +792,7 @@ |
| 14 |
module.libraries.extend(wxlibs) |
14 |
module.libraries.extend(wxlibs) |
| 15 |
return |
15 |
return |
| 16 |
|
16 |
|
| 17 |
- get_pkgconfig(module, '', flags='--cppflags --libs', pkg_config_exec='wx-config') |
17 |
- get_pkgconfig(module, '', flags='--cppflags --libs', pkg_config_exec='wx-config') |
| 18 |
+ get_pkgconfig(module, '', flags='--cppflags --libs', pkg_config_exec=wxconfig) |
18 |
+ get_pkgconfig(module, '', flags='--cppflags --libs', pkg_config_exec=wxconfig) |
| 19 |
|
19 |
|
| 20 |
# Make sure you use the Tk version given by Tkinter.TkVersion |
20 |
# Make sure you use the Tk version given by Tkinter.TkVersion |
| 21 |
# or else you'll build for a wrong version of the Tcl |
21 |
# or else you'll build for a wrong version of the Tcl |
| 22 |
@@ -1092,9 +1095,9 @@ |
22 |
@@ -828,8 +831,12 @@ |
| 23 |
|
23 |
gotit = False |
|
|
24 |
|
| 25 |
if gotit: |
| 26 |
+ try: |
| 27 |
+ tk_v = Tkinter.__version__.split()[-2] |
| 28 |
+ except (AttributeError, IndexError): |
| 29 |
+ tk_v = 'version not identified' |
| 30 |
print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" % |
| 31 |
- (Tkinter.__version__.split()[-2], Tkinter.TkVersion, Tkinter.TclVersion)) |
| 32 |
+ (tk_v, Tkinter.TkVersion, Tkinter.TclVersion)) |
| 33 |
else: |
| 34 |
print_status("Tkinter", "no") |
| 35 |
if explanation is not None: |
| 36 |
@@ -1092,9 +1099,9 @@ |
| 37 |
|
| 24 |
# Add final versions of directories and libraries to module lists |
38 |
# Add final versions of directories and libraries to module lists |
| 25 |
tcl_lib, tcl_inc, tk_lib, tk_inc = result |
39 |
tcl_lib, tcl_inc, tk_lib, tk_inc = result |
| 26 |
- module.include_dirs.extend([tcl_inc, tk_inc]) |
40 |
- module.include_dirs.extend([tcl_inc, tk_inc]) |
| 27 |
- module.library_dirs.extend([tcl_lib, tk_lib]) |
41 |
- module.library_dirs.extend([tcl_lib, tk_lib]) |
| 28 |
- module.libraries.extend(['tk' + tk_ver, 'tcl' + tk_ver]) |
42 |
- module.libraries.extend(['tk' + tk_ver, 'tcl' + tk_ver]) |
| 29 |
+ module.include_dirs.extend(["%%TCL_INCLUDEDIR%%", "%%TK_INCLUDEDIR%%"]) |
43 |
+ module.include_dirs.extend(["/usr/local/include/tcl8.5", "/usr/local/include/tk8.5"]) |
| 30 |
+ module.library_dirs.extend(["%%TCL_LIBDIR%%", "%%TK_LIBDIR%%"]) |
44 |
+ module.library_dirs.extend(["/usr/local/lib/tcl8.5", "/usr/local/lib/tk8.5"]) |
| 31 |
+ module.libraries.extend(['tk' + "%%TK_VER%%", 'tcl' + "%%TCL_VER%%"]) |
45 |
+ module.libraries.extend(['tk' + "85", 'tcl' + "85"]) |
| 32 |
|
46 |
|
| 33 |
return message |
47 |
return message |
| 34 |
|
48 |
|