From 5ccb3c41fa6b3d7cc17cb6df444fc3273aba02ec Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Tue, 26 May 2009 09:59:18 +0000
Subject: 26998: use --htmldir, restore zsh default if unchanged from configure
 default

---
 configure.ac | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

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,
-- 
cgit 1.4.1