From: Junio C Hamano <junkio@cox.net>
Date: Wed, 4 Apr 2007 07:09:52 +0000 (-0700)
Subject: Merge branch 'post1.5.1/tcltk'
X-Git-Tag: v1.5.2-rc0~97
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=80b6e39459e0d960292520d665c83d2dc32c3327;p=git.git

Merge branch 'post1.5.1/tcltk'

* post1.5.1/tcltk:
  Optional Tck/Tk: ignore generated files.
  Eliminate checks of user-specified Tcl/Tk interpreter.
  Rewrite Tcl/Tk interpreter path for the GUI tools.
  Add --with-tcltk and --without-tcltk to configure.
  NO_TCLTK
---

80b6e39459e0d960292520d665c83d2dc32c3327
diff --cc Makefile
index bc8b70bf1,88f9025e4..ad321b35b
--- a/Makefile
+++ b/Makefile
@@@ -110,8 -110,12 +110,14 @@@ all:
  # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
  # MakeMaker (e.g. using ActiveState under Cygwin).
  #
 +# Define WITH_P4IMPORT to build and install Python git-p4import script.
 +#
+ # Define NO_TCLTK if you do not want Tcl/Tk GUI.
+ #
+ # The TCLTK_PATH variable governs the location of the Tck/Tk interpreter.
+ # If not set it defaults to the bare 'wish'. If it is set to the empty
+ # string then NO_TCLTK will be forced (this is used by configure script).
+ #
  
  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -662,7 -663,7 +679,8 @@@ prefix_SQ = $(subst ','\'',$(prefix)
  
  SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
 +PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
+ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  
  LIBS = $(GITLIBS) $(EXTLIBS)