===================================================================
RCS file: /cvs/mandoc/configure,v
retrieving revision 1.32
retrieving revision 1.36
diff -u -p -r1.32 -r1.36
--- mandoc/configure	2015/11/07 13:14:21	1.32
+++ mandoc/configure	2015/11/07 21:31:22	1.36
@@ -16,8 +16,8 @@
 
 set -e
 
-[ -e config.log ] && mv config.log config.log.old
-[ -e config.h   ] && mv config.h config.h.old
+[ -w config.log ] && mv config.log config.log.old
+[ -w config.h   ] && mv config.h config.h.old
 
 # Output file descriptor usage:
 # 1 (stdout): config.h, Makefile.local
@@ -44,8 +44,8 @@ BUILD_CGI=0
 
 HAVE_DIRENT_NAMLEN=
 HAVE_ERR=
-HAVE_FGETLN=
 HAVE_FTS=
+HAVE_GETLINE=
 HAVE_GETSUBOPT=
 HAVE_ISBLANK=
 HAVE_MKDTEMP=
@@ -102,7 +102,7 @@ INSTALL_DATA=
 
 # --- manual settings from configure.local -----------------------------
 
-if [ -e ./configure.local ]; then
+if [ -r ./configure.local ]; then
 	echo "configure.local: reading..." 1>&2
 	echo "configure.local: reading..." 1>&3
 	cat ./configure.local 1>&3
@@ -176,8 +176,8 @@ runtest() {
 # --- library functions ---
 runtest dirent-namlen	DIRENT_NAMLEN	|| true
 runtest err		ERR		|| true
-runtest fgetln		FGETLN		|| true
 runtest fts		FTS		|| true
+runtest getline		GETLINE		|| true
 runtest getsubopt	GETSUBOPT	|| true
 runtest isblank		ISBLANK		|| true
 runtest mkdtemp		MKDTEMP		|| true
@@ -276,6 +276,10 @@ fi
 exec > config.h
 
 cat << __HEREDOC__
+#ifdef __cplusplus
+#error "Do not use C++.  See the INSTALL file."
+#endif
+
 #ifndef MANDOC_CONFIG_H
 #define MANDOC_CONFIG_H
 
@@ -285,11 +289,11 @@ cat << __HEREDOC__
 
 __HEREDOC__
 
-[ ${HAVE_FGETLN} -eq 0 -o ${HAVE_REALLOCARRAY} -eq 0 -o \
+[ ${HAVE_GETLINE} -eq 0 -o ${HAVE_REALLOCARRAY} -eq 0 -o \
   ${HAVE_STRLCAT} -eq 0 -o ${HAVE_STRLCPY} -eq 0 ] \
 	&& echo "#include <sys/types.h>"
 [ ${HAVE_VASPRINTF} -eq 0 ] && echo "#include <stdarg.h>"
-[ ${HAVE_FGETLN} -eq 0 ] && echo "#include <stdio.h>"
+[ ${HAVE_GETLINE} -eq 0 ] && echo "#include <stdio.h>"
 
 echo
 echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""
@@ -300,8 +304,8 @@ echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
 cat << __HEREDOC__
 #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}
 #define HAVE_ERR ${HAVE_ERR}
-#define HAVE_FGETLN ${HAVE_FGETLN}
 #define HAVE_FTS ${HAVE_FTS}
+#define HAVE_GETLINE ${HAVE_GETLINE}
 #define HAVE_GETSUBOPT ${HAVE_GETSUBOPT}
 #define HAVE_ISBLANK ${HAVE_ISBLANK}
 #define HAVE_MKDTEMP ${HAVE_MKDTEMP}
@@ -331,21 +335,6 @@ cat << __HEREDOC__
 #define BINM_SOELIM "${BINM_SOELIM}"
 #define BINM_WHATIS "${BINM_WHATIS}"
 
-#if !defined(__BEGIN_DECLS)
-#  ifdef __cplusplus
-#  define	__BEGIN_DECLS		extern "C" {
-#  else
-#  define	__BEGIN_DECLS
-#  endif
-#endif
-#if !defined(__END_DECLS)
-#  ifdef __cplusplus
-#  define	__END_DECLS		}
-#  else
-#  define	__END_DECLS
-#  endif
-#endif
-
 __HEREDOC__
 
 if [ ${HAVE_ERR} -eq 0 ]; then
@@ -354,8 +343,8 @@ if [ ${HAVE_ERR} -eq 0 ]; then
 	echo "extern	void	  warnx(const char *, ...);"
 fi
 
-[ ${HAVE_FGETLN} -eq 0 ] && \
-	echo "extern	char	 *fgetln(FILE *, size_t *);"
+[ ${HAVE_GETLINE} -eq 0 ] && \
+	echo "extern	ssize_t	  getline(char **, size_t *, FILE *);"
 
 [ ${HAVE_GETSUBOPT} -eq 0 ] && \
 	echo "extern	int	  getsubopt(char **, char * const *, char **);"