summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2003-05-03 08:45:51 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2003-05-03 08:45:51 (GMT)
commite86a59af886d6c0f58f53e42878a25e48627fed1 (patch)
treef53be9b4285d11e90dcd58b7155c5f13b1e466c6
parent930427b89287ab0ef2ea07b0de069a08bd00e0f7 (diff)
downloadcpython-e86a59af886d6c0f58f53e42878a25e48627fed1.zip
cpython-e86a59af886d6c0f58f53e42878a25e48627fed1.tar.gz
cpython-e86a59af886d6c0f58f53e42878a25e48627fed1.tar.bz2
Change 'and' to 'or' in _tkinter test.
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index f69ae16..2d6c085 100644
--- a/setup.py
+++ b/setup.py
@@ -932,7 +932,7 @@ class PyBuildExt(build_ext):
tcl_includes = find_file('tcl.h', inc_dirs, debian_tcl_include)
tk_includes = find_file('tk.h', inc_dirs, debian_tk_include)
- if (tcllib is None or tklib is None and
+ if (tcllib is None or tklib is None or
tcl_includes is None or tk_includes is None):
# Something's missing, so give up
return