summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c50f15f9..5dc281a6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2016-09-28 Peter Stephenson <p.stephenson@samsung.com>
+ * Martijn Dekker: 39463: configure.ac: another way of getting
+ the default system path.
+
* 39460: Src/params.c, Src/zsh.h: don't import PS4 if running as
root. Currently no known exploit with this in zsh as xtrace
needs an explicit option setting, so this is just precautionary.
diff --git a/configure.ac b/configure.ac
index 0e0bd535a..e0eb3205e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2035,6 +2035,8 @@ AC_CACHE_VAL(zsh_cv_cs_path,
zsh_cv_cs_path=`getconf _CS_PATH`
elif getconf CS_PATH >/dev/null 2>&1; then
zsh_cv_cs_path=`getconf CS_PATH`
+elif getconf PATH >/dev/null 2>&1; then
+ zsh_cv_cs_path=`getconf PATH`
else
zsh_cv_cs_path="/bin:/usr/bin"
fi])