Revert part of the previous diff to fix a regression (another endless loop)

[mandoc.git] / configure

diff --git a/configure b/configure
index 377d49c5bdd23b8c759839c678697204f07eb9ba..5cf4e081c2cb2a8c847ac3997b2cd9e16f7eee08 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 #!/bin/sh
 #

-# $Id: configure,v 1.77 2020/07/20 16:57:30 schwarze Exp $
+# $Id: configure,v 1.81 2021/09/20 10:19:51 schwarze Exp $

 #
 #

-# Copyright (c) 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2014-2021 Ingo Schwarze <schwarze@openbsd.org>

 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above


@@ -41,6 +41,7 @@ OSENUM=
 OSNAME=
 UTF8_LOCALE=
 
 OSNAME=
 UTF8_LOCALE=
 

+AR=ar

 CC=cc
 CFLAGS=
 FATAL=0
 CC=cc
 CFLAGS=
 FATAL=0


@@ -68,6 +69,7 @@ HAVE_GETSUBOPT=
 HAVE_ISBLANK=
 HAVE_LESS_T=
 HAVE_MKDTEMP=
 HAVE_ISBLANK=
 HAVE_LESS_T=
 HAVE_MKDTEMP=

+HAVE_MKSTEMPS=

 HAVE_NANOSLEEP=
 HAVE_NTOHL=
 HAVE_O_DIRECTORY=
 HAVE_NANOSLEEP=
 HAVE_NTOHL=
 HAVE_O_DIRECTORY=


@@ -107,7 +109,7 @@ BIN_FROM_SBIN=
 INCLUDEDIR=
 LIBDIR=
 MANDIR=
 INCLUDEDIR=
 LIBDIR=
 MANDIR=

-HOMEBREWDIR=
+READ_ALLOWED_PATH=

 
 WWWPREFIX="/var/www"
 HTDOCDIR=
 
 WWWPREFIX="/var/www"
 HTDOCDIR=


@@ -263,8 +265,8 @@ if [ -n "${CFLAGS}" ]; then
 else
        COMP="${CC} ${DEFCFLAGS} -Wno-unused -Werror"
 fi
 else
        COMP="${CC} ${DEFCFLAGS} -Wno-unused -Werror"
 fi

-echo -n "tested ${CC} -W: " 1>&2
-echo -n "testing ${CC} -W: " 1>&3
+printf "%s" "tested ${CC} -W: " 1>&2
+printf "%s" "testing ${CC} -W: " 1>&3

 runtest noop WFLAG || true
 
 if [ -n "${CFLAGS}" ]; then
 runtest noop WFLAG || true
 
 if [ -n "${CFLAGS}" ]; then


@@ -307,6 +309,7 @@ runtest getline             GETLINE         || true
 runtest getsubopt      GETSUBOPT       "" -D_GNU_SOURCE || true
 runtest isblank                ISBLANK         || true
 runtest mkdtemp                MKDTEMP         || 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
 runtest nanosleep      NANOSLEEP       "${LD_NANOSLEEP}" "-lrt" || true
 runtest ntohl          NTOHL           || true
 runtest O_DIRECTORY    O_DIRECTORY     || true


@@ -461,7 +464,8 @@ echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
 echo "#define OSENUM ${OSENUM}"
 [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
 [ -n "${UTF8_LOCALE}" ] && echo "#define UTF8_LOCALE \"${UTF8_LOCALE}\""
 echo "#define OSENUM ${OSENUM}"
 [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
 [ -n "${UTF8_LOCALE}" ] && echo "#define UTF8_LOCALE \"${UTF8_LOCALE}\""

-[ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""
+[ -n "${READ_ALLOWED_PATH}" ] \
+       && echo "#define READ_ALLOWED_PATH \"${READ_ALLOWED_PATH}\""

 [ ${HAVE_ATTRIBUTE} -eq 0 ] && echo "#define __attribute__(x)"
 [ ${HAVE_EFTYPE} -eq 0 ] && echo "#define EFTYPE EINVAL"
 [ ${HAVE_O_DIRECTORY} -eq 0 ] && echo "#define O_DIRECTORY 0"
 [ ${HAVE_ATTRIBUTE} -eq 0 ] && echo "#define __attribute__(x)"
 [ ${HAVE_EFTYPE} -eq 0 ] && echo "#define EFTYPE EINVAL"
 [ ${HAVE_O_DIRECTORY} -eq 0 ] && echo "#define O_DIRECTORY 0"


@@ -482,6 +486,7 @@ cat << __HEREDOC__
 #define HAVE_ISBLANK ${HAVE_ISBLANK}
 #define HAVE_LESS_T ${HAVE_LESS_T}
 #define HAVE_MKDTEMP ${HAVE_MKDTEMP}
 #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}
 #define HAVE_NTOHL ${HAVE_NTOHL}
 #define HAVE_PLEDGE ${HAVE_PLEDGE}
 #define HAVE_PROGNAME ${HAVE_PROGNAME}


@@ -542,6 +547,10 @@ if [ ${HAVE_MKDTEMP} -eq 0 ]; then
        echo "extern    char     *mkdtemp(char *);"
        MANDOC_COBJS="${MANDOC_COBJS} compat_mkdtemp.o"
 fi
        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
 if [ ${HAVE_OHASH} -eq 0 ]; then
        MANDOC_COBJS="${MANDOC_COBJS} compat_ohash.o"
 fi


@@ -626,6 +635,7 @@ INSTALL_TARGETS=
 cat << __HEREDOC__
 BUILD_TARGETS  = ${BUILD_TARGETS}
 INSTALL_TARGETS        = ${INSTALL_TARGETS}
 cat << __HEREDOC__
 BUILD_TARGETS  = ${BUILD_TARGETS}
 INSTALL_TARGETS        = ${INSTALL_TARGETS}

+AR             = ${AR}

 CC             = ${CC}
 CFLAGS         = ${CFLAGS}
 LDADD          = ${LDADD}
 CC             = ${CC}
 CFLAGS         = ${CFLAGS}
 LDADD          = ${LDADD}