summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-16 15:23:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-16 15:23:35 (GMT)
commit9721d2fb10cd81d162248322facdc050433da50f (patch)
tree02e546252cc6344a7213cca1b542f00f7648aacc
parent5087aace2d5467046c7204e038009b30fdebbca6 (diff)
parent213639494e897502b73648aebbf274e4ae0cb27e (diff)
downloadgit-9721d2fb10cd81d162248322facdc050433da50f.zip
git-9721d2fb10cd81d162248322facdc050433da50f.tar.gz
git-9721d2fb10cd81d162248322facdc050433da50f.tar.bz2
Merge branch 'sl/customize-sane-tool-path'
* sl/customize-sane-tool-path: configure: allow user to prevent $PATH "sanitization" on Solaris
-rw-r--r--configure.ac17
1 files changed, 17 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 8bb0f44..72f7958 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,6 +137,23 @@ if test -n "$1"; then
fi
])
+# Directories holding "saner" versions of common or POSIX binaries.
+AC_ARG_WITH([sane-tool-path],
+ [AS_HELP_STRING(
+ [--with-sane-tool-path=DIR-1[[:DIR-2...:DIR-n]]],
+ [Directories to prepend to PATH in build system and generated scripts])],
+ [if test "$withval" = "no"; then
+ withval=''
+ else
+ AC_MSG_NOTICE([Setting SANE_TOOL_PATH to '$withval'])
+ fi
+ GIT_CONF_APPEND_LINE([SANE_TOOL_PATH=$withval])],
+ [# If the "--with-sane-tool-path" option was not given, don't touch
+ # SANE_TOOL_PATH here, but let defaults in Makefile take care of it.
+ # This should minimize spurious differences in the behaviour of the
+ # Git build system when configure is used w.r.t. when it is not.
+ :])
+
## Site configuration related to programs (before tests)
## --with-PACKAGE[=ARG] and --without-PACKAGE
#