Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary V. Vaughan <git@mlists.thewrittenword.com>2010-05-14 13:31:36 +0400
committerJunio C Hamano <gitster@pobox.com>2010-06-01 03:59:27 +0400
commitd1b1a919461c2f00d4e10f5ba227b13f800a6ac3 (patch)
tree9db6e71ab64e152fde0aa816272d58f9ec023971 /configure.ac
parent4b05548fc0523744b7a1276cfa0f4aae19d6d9c9 (diff)
Do not use "diff" found on PATH while building and installing
Some of the flags used with the first diff found in PATH cause the vendor diff to choke. Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index ad380b83d1..d8aab9a277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -362,6 +362,7 @@ fi
#AC_PROG_INSTALL # needs install-sh or install.sh in sources
AC_CHECK_TOOLS(AR, [gar ar], :)
AC_CHECK_PROGS(TAR, [gtar tar])
+AC_CHECK_PROGS(DIFF, [gnudiff gdiff diff])
# TCLTK_PATH will be set to some value if we want Tcl/Tk
# or will be empty otherwise.
if test -z "$NO_TCLTK"; then