diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 0be98c0fa..871ef73eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-03-18 Peter Stephenson <p.stephenson@samsung.com> + + * 34723: configure.ac: turn off fixed site function directory if + site function directory explicitly disabled. + 2015-03-17 Peter Stephenson <p.stephenson@samsung.com> * unposted: NEWS: rewrite the foregoing. diff --git a/configure.ac b/configure.ac index 7e770cd81..e4de193ed 100644 --- a/configure.ac +++ b/configure.ac @@ -318,7 +318,8 @@ fi], [sitefndir=${datadir}/${tzsh_name}/site-functions]) dnl Add /usr/local/share/zsh/site-functions if not yet present dnl owing to $sitefndir, whether or not explicitly given. dnl If not explicitly given, it hasn't been expanded yet. -if test X$sitefndir = X/usr/local/share/zsh/site-functions +if test X$sitefndir = X/usr/local/share/zsh/site-functions || \ + test X$sitefndir = Xno then fixed_sitefndir='' elif test X$prefix != X/usr/local; then if test X$prefix = XNONE && test X$ac_default_prefix = X/usr/local; then |