diff options
author | Ned Deily <nad@acm.org> | 2013-10-25 00:30:10 -0700 |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2013-10-25 00:30:10 -0700 |
commit | 801de814be4b81c8053ddf8b1cf4ec732ab5aaa7 (patch) | |
tree | 7e0eae7f4d7f7b726b2eda05380046707a852551 /Makefile.pre.in | |
parent | d2cc845a2b36b5862873620e4a8018f5cec7c3d5 (diff) | |
download | cpython-801de814be4b81c8053ddf8b1cf4ec732ab5aaa7.tar.gz |
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.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 84014b896c..cf75650f44 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -196,6 +196,10 @@ PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ 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 @@ -456,6 +460,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 |