Only compile compat_*.c implementations that are actually needed.

That's cleaner and it is supposed to fix compiler warnings with gcc 10
reported by Wynn Wolf Arbor <wolf at oriole dot systems> on discuss@.

1 files changed, 60 insertions, 29 deletions

diff --git a/configure b/configure
index 083d2d3f..dbd7762a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: configure,v 1.74 2020/06/14 23:40:31 schwarze Exp $
+# $Id: configure,v 1.75 2020/06/15 01:37:15 schwarze Exp $
 #
 # Copyright (c) 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -96,6 +96,9 @@ NEED_GNU_SOURCE=0
 NEED_OPENBSD_SOURCE=0
 NEED_XPG4_2=0
 
+MANDOC_COBJS=
+SOELIM_COBJS=
+
 PREFIX="/usr/local"
 BINDIR=
 SBINDIR=
@@ -499,52 +502,78 @@ if [ ${HAVE_ERR} -eq 0 ]; then
 	echo "extern	void	  errx(int, const char *, ...);"
 	echo "extern	void	  warn(const char *, ...);"
 	echo "extern	void	  warnx(const char *, ...);"
+	MANDOC_COBJS="${MANDOC_COBJS} compat_err.o"
+	SOELIM_COBJS="${SOELIM_COBJS} compat_err.o"
 fi
-
-[ ${HAVE_GETLINE} -eq 0 ] && \
+if [ ${HAVE_FTS} -eq 0 ]; then
+	MANDOC_COBJS="${MANDOC_COBJS} compat_fts.o"
+fi
+if [ ${HAVE_GETLINE} -eq 0 ]; then
 	echo "extern	ssize_t	  getline(char **, size_t *, FILE *);"
-
-[ ${HAVE_GETSUBOPT} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_getline.o"
+	SOELIM_COBJS="${SOELIM_COBJS} compat_getline.o"
+fi
+if [ ${HAVE_GETSUBOPT} -eq 0 ]; then
 	echo "extern	int	  getsubopt(char **, char * const *, char **);"
-
-[ ${HAVE_ISBLANK} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_getsubopt.o"
+fi
+if [ ${HAVE_ISBLANK} -eq 0 ]; then
 	echo "extern	int	  isblank(int);"
-
-[ ${HAVE_MKDTEMP} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_isblank.o"
+fi
+if [ ${HAVE_MKDTEMP} -eq 0 ]; then
 	echo "extern	char	 *mkdtemp(char *);"
-
+	MANDOC_COBJS="${MANDOC_COBJS} compat_mkdtemp.o"
+fi
+if [ ${HAVE_OHASH} -eq 0 ]; then
+	MANDOC_COBJS="${MANDOC_COBJS} compat_ohash.o"
+fi
 if [ ${HAVE_PROGNAME} -eq 0 ]; then
 	echo "extern	const char *getprogname(void);"
 	echo "extern	void	  setprogname(const char *);"
+	MANDOC_COBJS="${MANDOC_COBJS} compat_progname.o"
+	SOELIM_COBJS="${SOELIM_COBJS} compat_progname.o"
 fi
-
-[ ${HAVE_REALLOCARRAY} -eq 0 ] && \
+if [ ${HAVE_REALLOCARRAY} -eq 0 ]; then
 	echo "extern	void	 *reallocarray(void *, size_t, size_t);"
-
-[ ${HAVE_RECALLOCARRAY} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_reallocarray.o"
+	SOELIM_COBJS="${SOELIM_COBJS} compat_reallocarray.o"
+fi
+if [ ${HAVE_RECALLOCARRAY} -eq 0 ]; then
 	echo "extern	void	 *recallocarray(void *, size_t, size_t, size_t);"
-
-[ ${HAVE_STRCASESTR} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_recallocarray.o"
+fi
+if [ ${HAVE_STRCASESTR} -eq 0 ]; then
 	echo "extern	char	 *strcasestr(const char *, const char *);"
-
-[ ${HAVE_STRLCAT} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_strcasestr.o"
+fi
+if [ ${HAVE_STRINGLIST} -eq 0 ]; then
+	SOELIM_COBJS="${SOELIM_COBJS} compat_stringlist.o"
+fi
+if [ ${HAVE_STRLCAT} -eq 0 ]; then
 	echo "extern	size_t	  strlcat(char *, const char *, size_t);"
-
-[ ${HAVE_STRLCPY} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_strlcat.o"
+fi
+if [ ${HAVE_STRLCPY} -eq 0 ]; then
 	echo "extern	size_t	  strlcpy(char *, const char *, size_t);"
-
-[ ${HAVE_STRNDUP} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_strlcpy.o"
+fi
+if [ ${HAVE_STRNDUP} -eq 0 ]; then
 	echo "extern	char	 *strndup(const char *, size_t);"
-
-[ ${HAVE_STRSEP} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_strndup.o"
+fi
+if [ ${HAVE_STRSEP} -eq 0 ]; then
 	echo "extern	char	 *strsep(char **, const char *);"
-
-[ ${HAVE_STRTONUM} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_strsep.o"
+fi
+if [ ${HAVE_STRTONUM} -eq 0 ]; then
 	echo "extern	long long strtonum(const char *, long long, long long, const char **);"
-
-[ ${HAVE_VASPRINTF} -eq 0 ] && \
+	MANDOC_COBJS="${MANDOC_COBJS} compat_strtonum.o"
+fi
+if [ ${HAVE_VASPRINTF} -eq 0 ]; then
 	echo "extern	int	  vasprintf(char **, const char *, va_list);"
-
+	MANDOC_COBJS="${MANDOC_COBJS} compat_vasprintf.o"
+fi
 echo "file config.h: written" 1>&2
 echo "file config.h: written" 1>&3
 
@@ -584,6 +613,8 @@ CC		= ${CC}
 CFLAGS		= ${CFLAGS}
 LDADD		= ${LDADD}
 LDFLAGS		= ${LDFLAGS}
+MANDOC_COBJS	= ${MANDOC_COBJS}
+SOELIM_COBJS	= ${SOELIM_COBJS}
 STATIC		= ${STATIC}
 PREFIX		= ${PREFIX}
 BINDIR		= ${BINDIR}