diff options
| author | Ned Deily <nad@acm.org> | 2013-09-06 08:07:05 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2013-09-06 08:07:05 (GMT) |
| commit | d819b931f35852e1399f73ea19b74920ffde2651 (patch) | |
| tree | f39225228fc4009d774d5a217bebcb15fb55fe57 /Makefile.pre.in | |
| parent | d80f7be580bf9f6bcf2c7ae99c6a8afde6aafc6c (diff) | |
| download | cpython-d819b931f35852e1399f73ea19b74920ffde2651.zip cpython-d819b931f35852e1399f73ea19b74920ffde2651.tar.gz cpython-d819b931f35852e1399f73ea19b74920ffde2651.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.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index ca404cd..1d7b7c3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -207,6 +207,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 @@ -535,6 +539,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 |