From 6b4480e041335acb92e1c76c4bdc9186f5bfb0f2 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Tue, 19 Jul 2016 22:40:33 +0000
Subject: Now that our man.conf(5) format is mature and extremely simple,
 delete manpath(1) support.  With the mandoc-based man(1), manpath(1) is
 utterly useless.  Just set MANPATH_DEFAULT in configure.local for sane
 operating system defaults, use man.conf(5) for machine- specific
 modifications, and use ${MANPATH}, -m, and -M for user preferences.

---
 configure | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 77993f7d..7d61ea81 100755
--- a/configure
+++ b/configure
@@ -51,6 +51,7 @@ HAVE_GETLINE=
 HAVE_GETSUBOPT=
 HAVE_ISBLANK=
 HAVE_MKDTEMP=
+HAVE_OHASH=
 HAVE_PLEDGE=
 HAVE_PROGNAME=
 HAVE_REALLOCARRAY=
@@ -67,9 +68,6 @@ HAVE_STRTONUM=
 HAVE_VASPRINTF=
 HAVE_WCHAR=
 
-HAVE_OHASH=
-HAVE_MANPATH=
-
 PREFIX="/usr/local"
 BINDIR=
 SBINDIR=
@@ -217,21 +215,6 @@ echo "LDADD=\"${LDADD}\"" 1>&2
 echo "LDADD=\"${LDADD}\"" 1>&3
 echo 1>&3
 
-# --- manpath ---
-if ismanual manpath "${HAVE_MANPATH}"; then
-	:
-elif manpath 1>&3 2>&3; then
-	echo "manpath: yes" 1>&2
-	echo "manpath: yes" 1>&3
-	echo 1>&3
-	HAVE_MANPATH=1
-else
-	echo "manpath: no" 1>&2
-	echo "manpath: no" 1>&3
-	echo 1>&3
-	HAVE_MANPATH=0
-fi
-
 # --- write config.h ---
 
 exec > config.h
@@ -287,7 +270,6 @@ cat << __HEREDOC__
 #define HAVE_VASPRINTF ${HAVE_VASPRINTF}
 #define HAVE_WCHAR ${HAVE_WCHAR}
 #define HAVE_OHASH ${HAVE_OHASH}
-#define HAVE_MANPATH ${HAVE_MANPATH}
 
 #define BINM_APROPOS "${BINM_APROPOS}"
 #define BINM_MAKEWHATIS "${BINM_MAKEWHATIS}"
-- 
cgit v1.2.3-56-ge451