diff options
| author | Dan Nicholson <[email protected]> | 2008-06-30 09:40:30 -0700 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2008-07-12 10:25:40 -0700 |
| commit | bfb27b5fc020437d95b1185f0fce850209744d92 (patch) | |
| tree | 098a0facc626f441038af39ff01bc513c4a060f0 | |
| parent | 2d766923c45b544cca17c7fefe625715cf1fd1fe (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.
| -rw-r--r-- | configs/autoconf.in | 4 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 21d224fb329..d22c2c51839 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@ diff --git a/configure.ac b/configure.ac index ec8b5ddbc75..acb29e44686 100644 --- a/configure.ac +++ b/configure.ac @@ -33,18 +33,16 @@ AC_CHECK_PROGS([MAKE], [gmake make]) AC_PATH_PROG([MKDEP], [makedepend]) AC_PATH_PROG([SED], [sed]) -dnl Platform-specific program settings -EXTRA_CONFIG_LINES="" -AC_SUBST([EXTRA_CONFIG_LINES]) +dnl We need a POSIX shell for parts of the build. Assume we have one +dnl in most cases. case "$host_os" in solaris*) # Solaris /bin/sh is too old/non-POSIX compliant AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh]) - EXTRA_CONFIG_LINES="SHELL=$POSIX_SHELL" + SHELL="$POSIX_SHELL" ;; esac - MKDEP_OPTIONS=-fdepend dnl Ask gcc where it's keeping its secret headers if test "x$GCC" = xyes; then |