Skip to content

Commit 2136394

Browse files
slattarinigitster
authored andcommitted
configure: allow user to prevent $PATH "sanitization" on Solaris
On a Solaris 10 system with Solaris make installed as '/usr/xpg4/bin/make', GNU make installed as '/usr/local/bin/make', and with '/usr/local/bin' appearing in $PATH *before* '/usr/xpg4/bin', I was seeing errors like this upon invoking "make all": Usage : make [ -f makefile ][ -K statefile ]... make: Fatal error: Unknown option `-C' This happenes because the Git's Makefile, when running on Solaris, automatically "sanitizes" $PATH by prepending '/usr/xpg6/bin' and '/usr/xpg4/bin' to it in order to avoid using non-POSIX /bin/sh from being used. In the setup described above, however, this has an unintended consequence of forcing the use of Solaris make in recursive make invocations -- even if the $(MAKE) macro is being correctly used in them! When building without using the autoconf machinery, this can be solved by overriding $(SANE_TOOL_PATH). Teach the autoconf machinery to also allow users of ./configure to override it from the command line with a new --with-sane-tool-path option. Signed-off-by: Stefano Lattarini <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 56a33c8 commit 2136394

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

configure.ac

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,23 @@ if test -n "$1"; then
137137
fi
138138
])
139139

140+
# Directories holding "saner" versions of common or POSIX binaries.
141+
AC_ARG_WITH([sane-tool-path],
142+
[AS_HELP_STRING(
143+
[--with-sane-tool-path=DIR-1[[:DIR-2...:DIR-n]]],
144+
[Directories to prepend to PATH in build system and generated scripts])],
145+
[if test "$withval" = "no"; then
146+
withval=''
147+
else
148+
AC_MSG_NOTICE([Setting SANE_TOOL_PATH to '$withval'])
149+
fi
150+
GIT_CONF_APPEND_LINE([SANE_TOOL_PATH=$withval])],
151+
[# If the "--with-sane-tool-path" option was not given, don't touch
152+
# SANE_TOOL_PATH here, but let defaults in Makefile take care of it.
153+
# This should minimize spurious differences in the behaviour of the
154+
# Git build system when configure is used w.r.t. when it is not.
155+
:])
156+
140157
## Site configuration related to programs (before tests)
141158
## --with-PACKAGE[=ARG] and --without-PACKAGE
142159
#

0 commit comments

Comments
 (0)