diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2009-05-26 09:59:18 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2009-05-26 09:59:18 +0000 |
| commit | 5ccb3c41fa6b3d7cc17cb6df444fc3273aba02ec (patch) | |
| tree | f5ee941d1d82c4fd4074a92673f430a1ecf7cfff /configure.ac | |
| parent | ef9844b34cda97892b5342258f34c58a64ad3c2f (diff) | |
| download | zsh-5ccb3c41fa6b3d7cc17cb6df444fc3273aba02ec.tar.gz zsh-5ccb3c41fa6b3d7cc17cb6df444fc3273aba02ec.tar.xz zsh-5ccb3c41fa6b3d7cc17cb6df444fc3273aba02ec.zip | |
26998: use --htmldir, restore zsh default if unchanged from configure default
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b22205dcc..01388ec9b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ dnl support, updates, enhancements, or modifications. dnl AC_INIT(Src/zsh.h) -AC_PREREQ(2.53b) +AC_PREREQ(2.59c) AC_CONFIG_HEADER(config.h) dnl What version of zsh are we building ? @@ -304,6 +304,12 @@ fi], [sitescriptdir=${datadir}/${tzsh_name}/scripts]) AC_SUBST(scriptdir)dnl AC_SUBST(sitescriptdir)dnl +dnl htmldir is already handled, but if it wasn't set, use +dnl the standard zsh default. +if test x$htmldir = x'${docdir}' || test x$htmldir = x; then + htmldir='$(datadir)/$(tzsh)/htmldoc' +fi + AH_TEMPLATE([CUSTOM_PATCHLEVEL], [Define to a custom value for the ZSH_PATCHLEVEL parameter]) AC_ARG_ENABLE(custom-patchlevel, |