summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/autoconf.in4
-rw-r--r--configure.ac8
2 files changed, 4 insertions, 8 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@
diff --git a/configure.ac b/configure.ac
index ec8b5ddbc7..acb29e4468 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