From ede0a3ee0dd70c9f52652d42d69464cee043e1ba Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 6 Sep 2013 01:07:05 -0700 Subject: 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" --- Makefile.pre.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile.pre.in') diff --git a/Makefile.pre.in b/Makefile.pre.in index ca404cd763..1d7b7c3c66 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 -- cgit v1.2.1