summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2008-06-30 09:40:30 -0700
committerDan Nicholson <dbn.lists@gmail.com>2008-07-12 10:25:40 -0700
commitbfb27b5fc020437d95b1185f0fce850209744d92 (patch)
tree098a0facc626f441038af39ff01bc513c4a060f0 /configs
parent2d766923c45b544cca17c7fefe625715cf1fd1fe (diff)
autoconf: Subsitute SHELL for all platforms
Establish the shell that make will use from configure. This is exactly how autoconf/automake operate, with the environment variable CONFIG_SHELL respected to override the autoconf checks. In the usual case where the user just executes `./configure', autoconf will pick a shell from the current shell, sh, bash, ksh or sh5 that meets its base criteria. The special Solaris case of looking for a POSIX shell has been changed to just set the SHELL variable since autoconf substitutes this already. The EXTRA_CONFIG_LINES substitution is dropped as it should no longer be needed.
Diffstat (limited to 'configs')
-rw-r--r--configs/autoconf.in4
1 files changed, 1 insertions, 3 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index 21d224fb32..d22c2c5183 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -27,6 +27,7 @@ ASM_API = @ASM_API@
# Misc tools and flags
MAKE = @MAKE@
+SHELL = @SHELL@
MKLIB_OPTIONS = @MKLIB_OPTIONS@
MKDEP = @MKDEP@
MKDEP_OPTIONS = @MKDEP_OPTIONS@
@@ -101,6 +102,3 @@ DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
# Where libGL will look for DRI hardware drivers
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
-
-# Additional per-platform configuration settings
-@EXTRA_CONFIG_LINES@