=================================================================== RCS file: /cvs/mandoc/configure,v retrieving revision 1.79 retrieving revision 1.83 diff -u -p -r1.79 -r1.83 --- mandoc/configure 2021/09/19 12:28:04 1.79 +++ mandoc/configure 2023/10/19 11:45:42 1.83 @@ -1,8 +1,8 @@ #!/bin/sh # -# $Id: configure,v 1.79 2021/09/19 12:28:04 schwarze Exp $ +# $Id: configure,v 1.83 2023/10/19 11:45:42 schwarze Exp $ # -# Copyright (c) 2014-2020 Ingo Schwarze +# Copyright (c) 2014-2021 Ingo Schwarze # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -37,10 +37,12 @@ SOURCEDIR=`dirname "${0}"` MANPATH_BASE="/usr/share/man:/usr/X11R6/man" MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man" +DEBUG_MEMORY=0 OSENUM= OSNAME= UTF8_LOCALE= +AR=ar CC=cc CFLAGS= FATAL=0 @@ -68,6 +70,7 @@ HAVE_GETSUBOPT= HAVE_ISBLANK= HAVE_LESS_T= HAVE_MKDTEMP= +HAVE_MKSTEMPS= HAVE_NANOSLEEP= HAVE_NTOHL= HAVE_O_DIRECTORY= @@ -97,6 +100,7 @@ NEED_GNU_SOURCE=0 NEED_OPENBSD_SOURCE=0 NEED_XPG4_2=0 +DEBUG_OBJS= MANDOC_COBJS= SOELIM_COBJS= @@ -107,6 +111,7 @@ BIN_FROM_SBIN= INCLUDEDIR= LIBDIR= MANDIR= +MISCDIR= READ_ALLOWED_PATH= WWWPREFIX="/var/www" @@ -307,6 +312,7 @@ runtest getline GETLINE || true runtest getsubopt GETSUBOPT "" -D_GNU_SOURCE || true runtest isblank ISBLANK || true runtest mkdtemp MKDTEMP || true +runtest mkstemps MKSTEMPS || true runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" "-lrt" || true runtest ntohl NTOHL || true runtest O_DIRECTORY O_DIRECTORY || true @@ -331,6 +337,7 @@ runtest vasprintf VASPRINTF "" -D_GNU_SOURCE || true # --- fts --- if [ "${1}" = "-depend" ]; then + DEBUG_MEMORY=1 HAVE_FTS=0 HAVE_FTS_COMPARE_CONST=0 echo "tested fts: HAVE_FTS=0 (for make depend)" 1>&2 @@ -458,6 +465,10 @@ echo echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\"" echo "#define MANPATH_BASE \"${MANPATH_BASE}\"" echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\"" +if [ ${DEBUG_MEMORY} -ne 0 ]; then + echo "#define DEBUG_MEMORY ${DEBUG_MEMORY}" + DEBUG_OBJS=mandoc_dbg.o +fi echo "#define OSENUM ${OSENUM}" [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\"" [ -n "${UTF8_LOCALE}" ] && echo "#define UTF8_LOCALE \"${UTF8_LOCALE}\"" @@ -483,6 +494,7 @@ cat << __HEREDOC__ #define HAVE_ISBLANK ${HAVE_ISBLANK} #define HAVE_LESS_T ${HAVE_LESS_T} #define HAVE_MKDTEMP ${HAVE_MKDTEMP} +#define HAVE_MKSTEMPS ${HAVE_MKSTEMPS} #define HAVE_NTOHL ${HAVE_NTOHL} #define HAVE_PLEDGE ${HAVE_PLEDGE} #define HAVE_PROGNAME ${HAVE_PROGNAME} @@ -543,6 +555,10 @@ if [ ${HAVE_MKDTEMP} -eq 0 ]; then echo "extern char *mkdtemp(char *);" MANDOC_COBJS="${MANDOC_COBJS} compat_mkdtemp.o" fi +if [ ${HAVE_MKSTEMPS} -eq 0 ]; then + echo "extern int mkstemps(char *, int);" + MANDOC_COBJS="${MANDOC_COBJS} compat_mkstemps.o" +fi if [ ${HAVE_OHASH} -eq 0 ]; then MANDOC_COBJS="${MANDOC_COBJS} compat_ohash.o" fi @@ -605,6 +621,7 @@ exec > Makefile.local [ -z "${INCLUDEDIR}" ] && INCLUDEDIR="${PREFIX}/include/mandoc" [ -z "${LIBDIR}" ] && LIBDIR="${PREFIX}/lib/mandoc" [ -z "${MANDIR}" ] && MANDIR="${PREFIX}/man" +[ -z "${MISCDIR}" ] && MISCDIR="${PREFIX}/share/misc" [ -z "${HTDOCDIR}" ] && HTDOCDIR="${WWWPREFIX}/htdocs" [ -z "${CGIBINDIR}" ] && CGIBINDIR="${WWWPREFIX}/cgi-bin" @@ -627,10 +644,12 @@ INSTALL_TARGETS= cat << __HEREDOC__ BUILD_TARGETS = ${BUILD_TARGETS} INSTALL_TARGETS = ${INSTALL_TARGETS} +AR = ${AR} CC = ${CC} CFLAGS = ${CFLAGS} LDADD = ${LDADD} LDFLAGS = ${LDFLAGS} +DEBUG_OBJS = ${DEBUG_OBJS} MANDOC_COBJS = ${MANDOC_COBJS} SOELIM_COBJS = ${SOELIM_COBJS} STATIC = ${STATIC} @@ -641,6 +660,7 @@ BIN_FROM_SBIN = ${BIN_FROM_SBIN} INCLUDEDIR = ${INCLUDEDIR} LIBDIR = ${LIBDIR} MANDIR = ${MANDIR} +MISCDIR = ${MISCDIR} WWWPREFIX = ${WWWPREFIX} HTDOCDIR = ${HTDOCDIR} CGIBINDIR = ${CGIBINDIR}