summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2013-10-25 07:34:44 (GMT)
committerNed Deily <nad@acm.org>2013-10-25 07:34:44 (GMT)
commit65657c27fabc9d2419d1616c7e0e3915998047e0 (patch)
tree913bf075294f6b86891d771a1de5056cd6309d6b /Makefile.pre.in
parent7d6392c517c6501d79541b4b2bdbfd661b9322a7 (diff)
downloadcpython-65657c27fabc9d2419d1616c7e0e3915998047e0.zip
cpython-65657c27fabc9d2419d1616c7e0e3915998047e0.tar.gz
cpython-65657c27fabc9d2419d1616c7e0e3915998047e0.tar.bz2
Issue #1584: Provide options to override default search paths for Tcl and Tk
when building _tkinter. configure has two new options; if used, both must be specified: ./configure \ --with-tcltk-includes="-I/opt/local/include" \ --with-tcltk-libs="-L/opt/local/lib -ltcl8.5 -ltk8.5" In addition, the options can be overridden with make: make \ TCLTK_INCLUDES="-I/opt/local/include" \ TCLTK_LIBS="-L/opt/local/lib -ltcl8.6 -ltk8.6"
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index ffaf8fef..27dd75f 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -208,6 +208,10 @@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@
BUILD_GNU_TYPE= @build@
HOST_GNU_TYPE= @host@
+# Tcl and Tk config info from --with-tcltk-includes and -libs options
+TCLTK_INCLUDES= @TCLTK_INCLUDES@
+TCLTK_LIBS= @TCLTK_LIBS@
+
# The task to run while instrument when building the profile-opt target
PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
#PROFILE_TASK= $(srcdir)/Lib/test/regrtest.py
@@ -493,6 +497,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt
*) quiet="";; \
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
# Build static library