[BACK]Return to configure CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/configure between version 1.59 and 1.76

version 1.59, 2017/02/16 16:09:33 version 1.76, 2020/06/22 20:00:38
Line 2 
Line 2 
 #  #
 # $Id$  # $Id$
 #  #
 # Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>  # Copyright (c) 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
 #  #
 # Permission to use, copy, modify, and distribute this software for any  # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above  # purpose with or without fee is hereby granted, provided that the above
Line 27  set -e
Line 27  set -e
 # 3: config.log  # 3: config.log
   
 exec 3> config.log  exec 3> config.log
 echo "config.log: writing..."  echo "file config.log: writing..."
   
 # --- default settings -------------------------------------------------  # --- default settings -------------------------------------------------
 # Initialize all variables here,  # Initialize all variables here,
 # such that nothing can leak in from the environment.  # such that nothing can leak in from the environment.
   
   SOURCEDIR=`dirname "${0}"`
   
   MANPATH_BASE="/usr/share/man:/usr/X11R6/man"
 MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"  MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"
   OSENUM=
 OSNAME=  OSNAME=
 UTF8_LOCALE=  UTF8_LOCALE=
   
 CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`  CC=cc
 CFLAGS="-g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings"  CFLAGS=
 CFLAGS="${CFLAGS} -Wno-unused-parameter"  FATAL=0
 LDADD=  LDADD=
 LDFLAGS=  LDFLAGS=
 LD_NANOSLEEP=  LD_NANOSLEEP=
 LD_OHASH=  LD_OHASH=
 LD_RECVMSG=  LD_RECVMSG=
 STATIC="-static"  STATIC=
   
 BUILD_CGI=0  BUILD_CGI=0
 BUILD_CATMAN=0  BUILD_CATMAN=0
 INSTALL_LIBMANDOC=0  INSTALL_LIBMANDOC=0
   
   HAVE_ATTRIBUTE=
 HAVE_CMSG=  HAVE_CMSG=
 HAVE_CMSG_XPG42=0  
 HAVE_DIRENT_NAMLEN=  HAVE_DIRENT_NAMLEN=
 HAVE_EFTYPE=  HAVE_EFTYPE=
 HAVE_ENDIAN=  HAVE_ENDIAN=
Line 62  HAVE_FTS_COMPARE_CONST=
Line 66  HAVE_FTS_COMPARE_CONST=
 HAVE_GETLINE=  HAVE_GETLINE=
 HAVE_GETSUBOPT=  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
   HAVE_LESS_T=
 HAVE_MKDTEMP=  HAVE_MKDTEMP=
 HAVE_NANOSLEEP=  HAVE_NANOSLEEP=
 HAVE_NTOHL=  HAVE_NTOHL=
   HAVE_O_DIRECTORY=
 HAVE_OHASH=  HAVE_OHASH=
 HAVE_PATH_MAX=  HAVE_PATH_MAX=
 HAVE_PLEDGE=  HAVE_PLEDGE=
 HAVE_PROGNAME=  HAVE_PROGNAME=
 HAVE_REALLOCARRAY=  HAVE_REALLOCARRAY=
   HAVE_RECALLOCARRAY=
 HAVE_RECVMSG=  HAVE_RECVMSG=
 HAVE_REWB_BSD=  HAVE_REWB_BSD=
 HAVE_REWB_SYSV=  HAVE_REWB_SYSV=
Line 78  HAVE_STRCASESTR=
Line 85  HAVE_STRCASESTR=
 HAVE_STRINGLIST=  HAVE_STRINGLIST=
 HAVE_STRLCAT=  HAVE_STRLCAT=
 HAVE_STRLCPY=  HAVE_STRLCPY=
   HAVE_STRNDUP=
 HAVE_STRPTIME=  HAVE_STRPTIME=
 HAVE_STRSEP=  HAVE_STRSEP=
 HAVE_STRTONUM=  HAVE_STRTONUM=
Line 85  HAVE_SYS_ENDIAN=
Line 93  HAVE_SYS_ENDIAN=
 HAVE_VASPRINTF=  HAVE_VASPRINTF=
 HAVE_WCHAR=  HAVE_WCHAR=
   
   NEED_GNU_SOURCE=0
   NEED_OPENBSD_SOURCE=0
   NEED_XPG4_2=0
   
   MANDOC_COBJS=
   SOELIM_COBJS=
   
 PREFIX="/usr/local"  PREFIX="/usr/local"
 BINDIR=  BINDIR=
 SBINDIR=  SBINDIR=
   BIN_FROM_SBIN=
 INCLUDEDIR=  INCLUDEDIR=
 LIBDIR=  LIBDIR=
 MANDIR=  MANDIR=
Line 120  LN="ln -f"
Line 136  LN="ln -f"
 # --- manual settings from configure.local -----------------------------  # --- manual settings from configure.local -----------------------------
   
 if [ -r ./configure.local ]; then  if [ -r ./configure.local ]; then
         echo "configure.local: reading..." 1>&2          echo "file configure.local: reading..." 1>&2
         echo "configure.local: reading..." 1>&3          echo "file configure.local: reading..." 1>&3
         cat ./configure.local 1>&3          cat ./configure.local 1>&3
         . ./configure.local          . ./configure.local
 else  else
         echo "configure.local: no (fully automatic configuration)" 1>&2          echo "file configure.local: no (fully automatic configuration)" 1>&2
         echo "configure.local: no (fully automatic configuration)" 1>&3          echo "file configure.local: no (fully automatic configuration)" 1>&3
 fi  fi
 echo 1>&3  echo 1>&3
   
 # --- tests for config.h  ----------------------------------------------  # --- tests functions --------------------------------------------------
   
 COMP="${CC} ${CFLAGS} -Wno-unused -Werror"  
   
 # Check whether this HAVE_ setting is manually overridden.  # Check whether this HAVE_ setting is manually overridden.
 # If yes, use the override, if no, do not decide anything yet.  # If yes, use the override, if no, do not decide anything yet.
 # Arguments: lower-case test name, manual value  # Arguments: test file name, test var name, manual value
 ismanual() {  ismanual() {
         [ -z "${3}" ] && return 1          [ -z "${3}" ] && return 1
         echo "${1}: manual (HAVE_${2}=${3})" 1>&2          echo "tested ${1}: HAVE_${2}=${3} (manual)" 1>&2
         echo "${1}: manual (HAVE_${2}=${3})" 1>&3          echo "tested ${1}: HAVE_${2}=${3} (manual)" 1>&3
         echo 1>&3          echo 1>&3
         return 0          return 0
 }  }
Line 148  ismanual() {
Line 162  ismanual() {
 # Run a single autoconfiguration test.  # Run a single autoconfiguration test.
 # In case of success, enable the feature.  # In case of success, enable the feature.
 # In case of failure, do not decide anything yet.  # In case of failure, do not decide anything yet.
 # Arguments: lower-case test name, upper-case test name, additional CFLAGS  # Arguments: test file name, test var name, additional CFLAGS
 singletest() {  singletest() {
           n=${1}${3}
         cat 1>&3 << __HEREDOC__          cat 1>&3 << __HEREDOC__
 ${1}${3}: testing...  testing ${n} ...
 ${COMP} -o test-${1} test-${1}.c ${3}  ${COMP} -o test-${1} test-${1}.c ${3}
 __HEREDOC__  __HEREDOC__
   
         if ${COMP} -o "test-${1}" "test-${1}.c" ${3} 1>&3 2>&3; then          if ${COMP} -o "test-${1}" "${SOURCEDIR}/test-${1}.c" ${3} 1>&3 2>&3
                 echo "${1}${3}: ${CC} succeeded" 1>&3          then
                   echo "partial result of ${n}: ${CC} succeeded" 1>&3
         else          else
                 echo "${1}${3}: ${CC} failed with $?" 1>&3                  echo "tested ${n}: no (compilation failed)" 1>&2
                   echo "result of ${n}: ${CC} failed with exit status $?" 1>&3
                   echo "result of compiling ${n}: no" 1>&3
                 echo 1>&3                  echo 1>&3
                 return 1                  return 1
         fi          fi
   
         if ./test-${1} 1>&3 2>&3; then          if ./test-${1} 1>&3 2>&3; then
                 echo "${1}${3}: yes" 1>&2                  echo "tested ${n}: yes" 1>&2
                 echo "${1}${3}: yes" 1>&3                  echo "result of running ${n}: yes" 1>&3
                 echo 1>&3                  echo 1>&3
                 eval HAVE_${2}=1                  eval HAVE_${2}=1
                   [ "${3}" = "-D_GNU_SOURCE" ] && NEED_GNU_SOURCE=1
                   [ "${3}" = "-D_OPENBSD_SOURCE" ] && NEED_OPENBSD_SOURCE=1
                   [ "${3}" = "-D_XPG4_2" ] && NEED_XPG4_2=1
                   [ "${3}" = "-lrt" ] && LD_NANOSLEEP="-lrt"
                   [ "${3}" = "-lsocket" ] && LD_RECVMSG="-lsocket"
                   [ "${3}" = "-lutil" ] && LD_OHASH="-lutil"
                 rm "test-${1}"                  rm "test-${1}"
                 return 0                  return 0
         else          else
                 echo "${1}${3}: execution failed with $?" 1>&3                  echo "tested ${n}: no (execution failed)" 1>&2
                   echo "result of ${n}: execution failed with exit status $?" 1>&3
                   echo "result of running ${n}: no" 1>&3
                 echo 1>&3                  echo 1>&3
                 rm "test-${1}"                  rm "test-${1}"
                 return 1                  return 1
Line 180  __HEREDOC__
Line 206  __HEREDOC__
   
 # Run a complete autoconfiguration test, including the check for  # Run a complete autoconfiguration test, including the check for
 # a manual override and disabling the feature on failure.  # a manual override and disabling the feature on failure.
 # Arguments: lower case name, upper case name, additional CFLAGS  # Arguments: test file name, test var name, additional CFLAGS
   # The final argument can optionally be repeated a second time.
 runtest() {  runtest() {
         eval _manual=\${HAVE_${2}}          eval _manual=\${HAVE_${2}}
         ismanual "${1}" "${2}" "${_manual}" && return 0          ismanual "${1}" "${2}" "${_manual}" && return 0
         singletest "${1}" "${2}" "${3}" && return 0          singletest "${1}" "${2}" "${3}" && return 0
         echo "${1}${3}: no" 1>&2          [ -n "${4}" ] && singletest "${1}" "${2}" "${4}" && return 0
         eval HAVE_${2}=0          eval HAVE_${2}=0
         return 1          return 1
 }  }
Line 193  runtest() {
Line 220  runtest() {
 # Select a UTF-8 locale.  # Select a UTF-8 locale.
 get_locale() {  get_locale() {
         [ -n "${HAVE_WCHAR}" ] && [ "${HAVE_WCHAR}" -eq 0 ] && return 0          [ -n "${HAVE_WCHAR}" ] && [ "${HAVE_WCHAR}" -eq 0 ] && return 0
         ismanual UTF8_LOCALE UTF8_LOCALE "$UTF8_LOCALE" && return 0          ismanual UTF8_LOCALE UTF8_LOCALE "${UTF8_LOCALE}" && return 0
         echo "UTF8_LOCALE: testing..." 1>&3          echo "testing UTF8_LOCALE ..." 1>&3
         UTF8_LOCALE=`locale -a | grep -i '^en_US\.UTF-*8$' | head -n 1`          UTF8_LOCALE=`locale -a | grep -i '^en_US\.UTF-*8$' | head -n 1`
         if [ -z "${UTF8_LOCALE}" ]; then          if [ -z "${UTF8_LOCALE}" ]; then
                 UTF8_LOCALE=`locale -a | grep -i '\.UTF-*8' | head -n 1`                  UTF8_LOCALE=`locale -a | grep -i '\.UTF-*8' | head -n 1`
                 [ -n "${UTF8_LOCALE}" ] || return 1                  [ -n "${UTF8_LOCALE}" ] || return 1
         fi          fi
         echo "UTF8_LOCALE=${UTF8_LOCALE}" 1>&2          echo "selected UTF8_LOCALE=${UTF8_LOCALE}" 1>&2
         echo "UTF8_LOCALE=${UTF8_LOCALE}" 1>&3          echo "selected UTF8_LOCALE=${UTF8_LOCALE}" 1>&3
         echo 1>&3          echo 1>&3
         return 0;          return 0;
 }  }
   
   # --- operating system -------------------------------------------------
   
   if [ -n "${OSENUM}" ]; then
           echo "OSENUM specified manually: ${OSENUM}" 1>&2
           echo "OSENUM specified manually: ${OSENUM}" 1>&3
   else
           OSDETECT=`uname`
           if [ "${OSDETECT}" = "NetBSD" ]; then
                   OSENUM=MANDOC_OS_NETBSD
           elif [ "${OSDETECT}" = "OpenBSD" ]; then
                   OSENUM=MANDOC_OS_OPENBSD
           else
                   OSENUM=MANDOC_OS_OTHER
           fi
           echo "tested operating system: ${OSDETECT} -> OSENUM=${OSENUM}" 1>&2
           echo "tested operating system: ${OSDETECT} -> OSENUM=${OSENUM}" 1>&3
           unset OSDETECT
   fi
   echo 1>&3
   
   # --- compiler options -------------------------------------------------
   
   DEFCFLAGS="-g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings -Wno-unused-parameter"
   
   if [ -n "${CFLAGS}" ]; then
           COMP="${CC} ${CFLAGS} -Wno-unused -Werror"
   else
           COMP="${CC} ${DEFCFLAGS} -Wno-unused -Werror"
   fi
   echo -n "tested ${CC} -W: " 1>&2
   echo -n "testing ${CC} -W: " 1>&3
   runtest noop WFLAG || true
   
   if [ -n "${CFLAGS}" ]; then
           echo "CFLAGS specified manually:" 1>&3
   elif [ ${HAVE_WFLAG} -eq 0 ]; then
           CFLAGS="-g"
   else
           CFLAGS="${DEFCFLAGS}"
   fi
   echo "selected CFLAGS=\"${CFLAGS}\"" 1>&2
   echo "selected CFLAGS=\"${CFLAGS}\"" 1>&3
   echo 1>&3
   
   COMP="${CC} ${CFLAGS}"
   [ ${HAVE_WFLAG} -eq 0 ] || COMP="${COMP} -Wno-unused -Werror"
   
   if [ -n "${STATIC}" ]; then
           echo "selected STATIC=\"${STATIC}\" (manual)" 1>&2
           echo "selected STATIC=\"${STATIC}\" (manual)" 1>&3
           echo 1>&3
   else
           runtest noop STATIC -static || true
           [ ${HAVE_STATIC} -eq 0 ] || STATIC="-static"
           echo "selected STATIC=\"${STATIC}\"" 1>&2
           echo "selected STATIC=\"${STATIC}\"" 1>&3
           echo 1>&3
   fi
   
   # --- tests for config.h  ----------------------------------------------
   
 # --- library functions ---  # --- library functions ---
   runtest attribute       ATTRIBUTE       || true
   runtest cmsg            CMSG            "" "-D_XPG4_2" || true
 runtest dirent-namlen   DIRENT_NAMLEN   || true  runtest dirent-namlen   DIRENT_NAMLEN   || true
 runtest be32toh         ENDIAN          || true  runtest be32toh         ENDIAN          || true
 runtest be32toh         SYS_ENDIAN      -DSYS_ENDIAN || true  runtest be32toh         SYS_ENDIAN      -DSYS_ENDIAN || true
 runtest EFTYPE          EFTYPE          || true  runtest EFTYPE          EFTYPE          || true
 runtest err             ERR             || true  runtest err             ERR             || true
 runtest getline         GETLINE         || true  runtest getline         GETLINE         || true
 runtest getsubopt       GETSUBOPT       || true  runtest getsubopt       GETSUBOPT       "" -D_GNU_SOURCE || true
 runtest isblank         ISBLANK         || true  runtest isblank         ISBLANK         || true
 runtest mkdtemp         MKDTEMP         || true  runtest mkdtemp         MKDTEMP         || true
   runtest nanosleep       NANOSLEEP       "${LD_NANOSLEEP}" "-lrt" || true
 runtest ntohl           NTOHL           || true  runtest ntohl           NTOHL           || true
   runtest O_DIRECTORY     O_DIRECTORY     || true
 runtest PATH_MAX        PATH_MAX        || true  runtest PATH_MAX        PATH_MAX        || true
 runtest pledge          PLEDGE          || true  runtest pledge          PLEDGE          || true
 runtest sandbox_init    SANDBOX_INIT    || true  runtest sandbox_init    SANDBOX_INIT    || true
 runtest progname        PROGNAME        || true  runtest progname        PROGNAME        || true
 runtest reallocarray    REALLOCARRAY    || true  runtest reallocarray    REALLOCARRAY    "" -D_OPENBSD_SOURCE || true
   runtest recallocarray   RECALLOCARRAY   "" -D_OPENBSD_SOURCE || true
   runtest recvmsg         RECVMSG         "${LD_RECVMSG}" "-lsocket" || true
 runtest rewb-bsd        REWB_BSD        || true  runtest rewb-bsd        REWB_BSD        || true
 runtest rewb-sysv       REWB_SYSV       || true  runtest rewb-sysv       REWB_SYSV       || true
 runtest strcasestr      STRCASESTR      || true  runtest strcasestr      STRCASESTR      "" -D_GNU_SOURCE || true
 runtest stringlist      STRINGLIST      || true  runtest stringlist      STRINGLIST      || true
 runtest strlcat         STRLCAT         || true  runtest strlcat         STRLCAT         || true
 runtest strlcpy         STRLCPY         || true  runtest strlcpy         STRLCPY         || true
 runtest strptime        STRPTIME        || true  runtest strndup         STRNDUP         || true
   runtest strptime        STRPTIME        "" -D_GNU_SOURCE || true
 runtest strsep          STRSEP          || true  runtest strsep          STRSEP          || true
 runtest strtonum        STRTONUM        || true  runtest strtonum        STRTONUM        "" -D_OPENBSD_SOURCE || true
 runtest vasprintf       VASPRINTF       || true  runtest vasprintf       VASPRINTF       "" -D_GNU_SOURCE || true
   
 if [ ${HAVE_ENDIAN} -eq 0 -a \  # --- fts ---
      ${HAVE_SYS_ENDIAN} -eq 0 -a \  if [ "${1}" = "-depend" ]; then
      ${HAVE_NTOHL} -eq 0 ]; then          HAVE_FTS=0
         echo "FATAL: no endian conversion functions found" 1>&2  
         echo "FATAL: no endian conversion functions found" 1>&3  
         exit 1  
 fi  
   
 if ismanual fts FTS ${HAVE_FTS}; then  
         HAVE_FTS_COMPARE_CONST=0          HAVE_FTS_COMPARE_CONST=0
           echo "tested fts: HAVE_FTS=0 (for make depend)" 1>&2
           echo "tested fts: HAVE_FTS=0 (for make depend)" 1>&3
           echo 1>&3
   elif ismanual fts FTS ${HAVE_FTS}; then
           HAVE_FTS_COMPARE_CONST=0
 elif runtest fts FTS_COMPARE_CONST -DFTS_COMPARE_CONST; then  elif runtest fts FTS_COMPARE_CONST -DFTS_COMPARE_CONST; then
         HAVE_FTS=1          HAVE_FTS=1
 else  else
         runtest fts FTS || true          runtest fts FTS || true
 fi  fi
   
   # --- tagging support in the pager ---
   if ismanual "less -T" LESS_T ${HAVE_LESS_T}; then
           :
   elif less -ET /dev/null test-noop.c 1>/dev/null 2>&3; then
           HAVE_LESS_T=1
           echo "tested less -T: yes" 1>&2
           echo "tested less -T: yes" 1>&3
           echo 1>&3
   else
           HAVE_LESS_T=0
           echo "tested less -T: no" 1>&2
           echo "tested less -T: no" 1>&3
           echo 1>&3
   fi
   
 # --- wide character and locale support ---  # --- wide character and locale support ---
 if get_locale; then  if get_locale; then
         runtest wchar WCHAR -DUTF8_LOCALE=\"${UTF8_LOCALE}\" || true          runtest wchar WCHAR "-DUTF8_LOCALE=\"${UTF8_LOCALE}\"" \
               "-D_GNU_SOURCE -DUTF8_LOCALE=\"${UTF8_LOCALE}\"" || true
 else  else
         HAVE_WCHAR=0          HAVE_WCHAR=0
         echo "wchar: no (no UTF8_LOCALE)" 1>&2          echo "tested wchar: no (no UTF8_LOCALE)" 1>&2
         echo "wchar: no (no UTF8_LOCALE)" 1>&3          echo "tested wchar: no (no UTF8_LOCALE)" 1>&3
           echo 1>&3
 fi  fi
   
 # --- nanosleep ---  # --- ohash ---
 if [ -n "${LD_NANOSLEEP}" ]; then  if [ "${1}" = "-depend" ]; then
         runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" || true          HAVE_OHASH=0
 elif singletest nanosleep NANOSLEEP; then          echo "tested ohash: HAVE_OHASH=0 (for make depend)" 1>&2
         :          echo "tested ohash: HAVE_OHASH=0 (for make depend)" 1>&3
 elif runtest nanosleep NANOSLEEP "-lrt"; then          echo 1>&3
         LD_NANOSLEEP="-lrt"  else
           runtest ohash OHASH "${LD_OHASH}" "-lutil" || true
 fi  fi
   if [ "${HAVE_OHASH}" -eq 0 ]; then
           LD_OHASH=
   fi
   
   # --- required functions ---
   if [ ${HAVE_ENDIAN} -eq 0 -a \
        ${HAVE_SYS_ENDIAN} -eq 0 -a \
        ${HAVE_NTOHL} -eq 0 ]; then
           echo "FATAL: no endian conversion functions found" 1>&2
           echo "FATAL: no endian conversion functions found" 1>&3
           FATAL=1
   fi
 if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then  if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
         echo "FATAL: nanosleep: no" 1>&2          echo "FATAL: nanosleep: no" 1>&2
         echo "FATAL: nanosleep: no" 1>&3          echo "FATAL: nanosleep: no" 1>&3
         exit 1          FATAL=1
 fi  fi
   if [ ${BUILD_CATMAN} -gt 0 -a "${HAVE_RECVMSG}" -eq 0 ]; then
 if [ ${BUILD_CATMAN} -gt 0 ]; then          echo "FATAL: recvmsg: no" 1>&2
         # --- recvmsg ---          echo "FATAL: recvmsg: no" 1>&3
         if [ -n "${LD_RECVMSG}" ]; then          echo "Without recvmsg(2), you cannot BUILD_CATMAN." 1>&2
                 runtest recvmsg RECVMSG "${LD_RECVMSG}" || true          FATAL=1
         elif singletest recvmsg RECVMSG; then  
                 :  
         elif runtest recvmsg RECVMSG "-lsocket"; then  
                 LD_RECVMSG="-lsocket"  
         fi  
         if [ "${HAVE_RECVMSG}" -eq 0 ]; then  
                 echo "FATAL: recvmsg: no" 1>&2  
                 echo "FATAL: recvmsg: no" 1>&3  
                 echo "Without recvmsg(2), you cannot BUILD_CATMAN." 1>&2  
                 exit 1  
         fi  
   
         # --- cmsg ---  
         if singletest cmsg CMSG; then  
                 :  
         elif runtest cmsg CMSG "-D_XPG4_2"; then  
                 HAVE_CMSG_XPG42=1  
         fi  
         if [ "${HAVE_CMSG}" -eq 0 ]; then  
                 echo "FATAL: cmsg: no" 1>&2  
                 echo "FATAL: cmsg: no" 1>&3  
                 echo "Without CMSG_FIRSTHDR(3), you cannot BUILD_CATMAN." 1>&2  
                 exit 1  
         fi  
 fi  fi
   if [ ${BUILD_CATMAN} -gt 0 -a "${HAVE_CMSG}" -eq 0 ]; then
 # --- ohash ---          echo "FATAL: cmsg: no" 1>&2
 if ismanual ohash OHASH "${HAVE_OHASH}"; then          echo "FATAL: cmsg: no" 1>&3
         :          echo "Without CMSG_FIRSTHDR(3), you cannot BUILD_CATMAN." 1>&2
 elif [ -n "${LD_OHASH}" ]; then          FATAL=1
         runtest ohash OHASH "${LD_OHASH}" || true  
 elif singletest ohash OHASH; then  
         :  
 elif runtest ohash OHASH "-lutil"; then  
         LD_OHASH="-lutil"  
 fi  fi
 if [ "${HAVE_OHASH}" -eq 0 ]; then  [ "${FATAL}" -eq 0 ] || exit 1
         LD_OHASH=  
 fi  
   
 # --- LDADD ---  # --- LDADD ---
 LDADD="${LDADD} ${LD_NANOSLEEP} ${LD_RECVMSG} ${LD_OHASH} -lz"  LDADD="${LDADD} ${LD_NANOSLEEP} ${LD_RECVMSG} ${LD_OHASH} -lz"
 echo "LDADD=\"${LDADD}\"" 1>&2  echo "selected LDADD=\"${LDADD}\"" 1>&2
 echo "LDADD=\"${LDADD}\"" 1>&3  echo "selected LDADD=\"${LDADD}\"" 1>&3
 echo 1>&3  echo 1>&3
   
 # --- write config.h ---  # --- write config.h ---
Line 332  cat << __HEREDOC__
Line 424  cat << __HEREDOC__
 #error "Do not use C++.  See the INSTALL file."  #error "Do not use C++.  See the INSTALL file."
 #endif  #endif
   
 #if !defined(__GNUC__) || (__GNUC__ < 4)  
 #define __attribute__(x)  
 #endif  
   
 #if defined(__linux__) || defined(__MINT__)  
 #define _GNU_SOURCE     /* See test-*.c what needs this. */  
 #endif  
   
 __HEREDOC__  __HEREDOC__
   
 [ ${HAVE_GETLINE} -eq 0 -o ${HAVE_REALLOCARRAY} -eq 0 -o \  [ ${NEED_GNU_SOURCE} -eq 0 ] || echo "#define _GNU_SOURCE"
   ${HAVE_STRLCAT} -eq 0 -o ${HAVE_STRLCPY} -eq 0 ] \  [ ${NEED_OPENBSD_SOURCE} -eq 0 ] || echo "#define _OPENBSD_SOURCE"
   
   [ ${HAVE_GETLINE} -eq 0 -o \
     ${HAVE_REALLOCARRAY} -eq 0 -o ${HAVE_RECALLOCARRAY} -eq 0 -o \
     ${HAVE_STRLCAT} -eq 0 -o ${HAVE_STRLCPY} -eq 0 -o \
     ${HAVE_STRNDUP} -eq 0 ] \
         && echo "#include <sys/types.h>"          && echo "#include <sys/types.h>"
 [ ${HAVE_VASPRINTF} -eq 0 ] && echo "#include <stdarg.h>"  [ ${HAVE_VASPRINTF} -eq 0 ] && echo "#include <stdarg.h>"
 [ ${HAVE_GETLINE} -eq 0 ] && echo "#include <stdio.h>"  [ ${HAVE_GETLINE} -eq 0 ] && echo "#include <stdio.h>"
   
 echo  echo
 echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""  echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""
   echo "#define MANPATH_BASE \"${MANPATH_BASE}\""
 echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
   echo "#define OSENUM ${OSENUM}"
 [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""  [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
 [ -n "${UTF8_LOCALE}" ] && echo "#define UTF8_LOCALE \"${UTF8_LOCALE}\""  [ -n "${UTF8_LOCALE}" ] && echo "#define UTF8_LOCALE \"${UTF8_LOCALE}\""
 [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""  [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""
   [ ${HAVE_ATTRIBUTE} -eq 0 ] && echo "#define __attribute__(x)"
 [ ${HAVE_EFTYPE} -eq 0 ] && echo "#define EFTYPE EINVAL"  [ ${HAVE_EFTYPE} -eq 0 ] && echo "#define EFTYPE EINVAL"
   [ ${HAVE_O_DIRECTORY} -eq 0 ] && echo "#define O_DIRECTORY 0"
 [ ${HAVE_PATH_MAX} -eq 0 ] && echo "#define PATH_MAX 4096"  [ ${HAVE_PATH_MAX} -eq 0 ] && echo "#define PATH_MAX 4096"
 if [ ${HAVE_ENDIAN} -eq 0 -a ${HAVE_SYS_ENDIAN} -eq 0 ]; then  if [ ${HAVE_ENDIAN} -eq 0 -a ${HAVE_SYS_ENDIAN} -eq 0 ]; then
         echo "#define be32toh ntohl"          echo "#define be32toh ntohl"
         echo "#define htobe32 htonl"          echo "#define htobe32 htonl"
 fi  fi
   
 cat << __HEREDOC__  cat << __HEREDOC__
 #define HAVE_CMSG_XPG42 ${HAVE_CMSG_XPG42}  
 #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}  #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}
 #define HAVE_ENDIAN ${HAVE_ENDIAN}  #define HAVE_ENDIAN ${HAVE_ENDIAN}
 #define HAVE_ERR ${HAVE_ERR}  #define HAVE_ERR ${HAVE_ERR}
Line 371  cat << __HEREDOC__
Line 463  cat << __HEREDOC__
 #define HAVE_GETLINE ${HAVE_GETLINE}  #define HAVE_GETLINE ${HAVE_GETLINE}
 #define HAVE_GETSUBOPT ${HAVE_GETSUBOPT}  #define HAVE_GETSUBOPT ${HAVE_GETSUBOPT}
 #define HAVE_ISBLANK ${HAVE_ISBLANK}  #define HAVE_ISBLANK ${HAVE_ISBLANK}
   #define HAVE_LESS_T ${HAVE_LESS_T}
 #define HAVE_MKDTEMP ${HAVE_MKDTEMP}  #define HAVE_MKDTEMP ${HAVE_MKDTEMP}
 #define HAVE_NTOHL ${HAVE_NTOHL}  #define HAVE_NTOHL ${HAVE_NTOHL}
 #define HAVE_PLEDGE ${HAVE_PLEDGE}  #define HAVE_PLEDGE ${HAVE_PLEDGE}
 #define HAVE_PROGNAME ${HAVE_PROGNAME}  #define HAVE_PROGNAME ${HAVE_PROGNAME}
 #define HAVE_REALLOCARRAY ${HAVE_REALLOCARRAY}  #define HAVE_REALLOCARRAY ${HAVE_REALLOCARRAY}
   #define HAVE_RECALLOCARRAY ${HAVE_RECALLOCARRAY}
 #define HAVE_REWB_BSD ${HAVE_REWB_BSD}  #define HAVE_REWB_BSD ${HAVE_REWB_BSD}
 #define HAVE_REWB_SYSV ${HAVE_REWB_SYSV}  #define HAVE_REWB_SYSV ${HAVE_REWB_SYSV}
 #define HAVE_SANDBOX_INIT ${HAVE_SANDBOX_INIT}  #define HAVE_SANDBOX_INIT ${HAVE_SANDBOX_INIT}
Line 383  cat << __HEREDOC__
Line 477  cat << __HEREDOC__
 #define HAVE_STRINGLIST ${HAVE_STRINGLIST}  #define HAVE_STRINGLIST ${HAVE_STRINGLIST}
 #define HAVE_STRLCAT ${HAVE_STRLCAT}  #define HAVE_STRLCAT ${HAVE_STRLCAT}
 #define HAVE_STRLCPY ${HAVE_STRLCPY}  #define HAVE_STRLCPY ${HAVE_STRLCPY}
   #define HAVE_STRNDUP ${HAVE_STRNDUP}
 #define HAVE_STRPTIME ${HAVE_STRPTIME}  #define HAVE_STRPTIME ${HAVE_STRPTIME}
 #define HAVE_STRSEP ${HAVE_STRSEP}  #define HAVE_STRSEP ${HAVE_STRSEP}
 #define HAVE_STRTONUM ${HAVE_STRTONUM}  #define HAVE_STRTONUM ${HAVE_STRTONUM}
Line 390  cat << __HEREDOC__
Line 485  cat << __HEREDOC__
 #define HAVE_VASPRINTF ${HAVE_VASPRINTF}  #define HAVE_VASPRINTF ${HAVE_VASPRINTF}
 #define HAVE_WCHAR ${HAVE_WCHAR}  #define HAVE_WCHAR ${HAVE_WCHAR}
 #define HAVE_OHASH ${HAVE_OHASH}  #define HAVE_OHASH ${HAVE_OHASH}
   #define NEED_XPG4_2 ${NEED_XPG4_2}
   
 #define BINM_APROPOS "${BINM_APROPOS}"  #define BINM_APROPOS "${BINM_APROPOS}"
 #define BINM_CATMAN "${BINM_CATMAN}"  #define BINM_CATMAN "${BINM_CATMAN}"
Line 405  if [ ${HAVE_ERR} -eq 0 ]; then
Line 501  if [ ${HAVE_ERR} -eq 0 ]; then
         echo "extern    void      errx(int, const char *, ...);"          echo "extern    void      errx(int, const char *, ...);"
         echo "extern    void      warn(const char *, ...);"          echo "extern    void      warn(const char *, ...);"
         echo "extern    void      warnx(const char *, ...);"          echo "extern    void      warnx(const char *, ...);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_err.o"
           SOELIM_COBJS="${SOELIM_COBJS} compat_err.o"
 fi  fi
   if [ ${HAVE_FTS} -eq 0 ]; then
 [ ${HAVE_GETLINE} -eq 0 ] && \          MANDOC_COBJS="${MANDOC_COBJS} compat_fts.o"
   fi
   if [ ${HAVE_GETLINE} -eq 0 ]; then
         echo "extern    ssize_t   getline(char **, size_t *, FILE *);"          echo "extern    ssize_t   getline(char **, size_t *, FILE *);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_getline.o"
 [ ${HAVE_GETSUBOPT} -eq 0 ] && \          SOELIM_COBJS="${SOELIM_COBJS} compat_getline.o"
   fi
   if [ ${HAVE_GETSUBOPT} -eq 0 ]; then
         echo "extern    int       getsubopt(char **, char * const *, char **);"          echo "extern    int       getsubopt(char **, char * const *, char **);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_getsubopt.o"
 [ ${HAVE_ISBLANK} -eq 0 ] && \  fi
   if [ ${HAVE_ISBLANK} -eq 0 ]; then
         echo "extern    int       isblank(int);"          echo "extern    int       isblank(int);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_isblank.o"
 [ ${HAVE_MKDTEMP} -eq 0 ] && \  fi
   if [ ${HAVE_MKDTEMP} -eq 0 ]; then
         echo "extern    char     *mkdtemp(char *);"          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  if [ ${HAVE_PROGNAME} -eq 0 ]; then
         echo "extern    const char *getprogname(void);"          echo "extern    const char *getprogname(void);"
         echo "extern    void      setprogname(const char *);"          echo "extern    void      setprogname(const char *);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_progname.o"
           SOELIM_COBJS="${SOELIM_COBJS} compat_progname.o"
 fi  fi
   if [ ${HAVE_REALLOCARRAY} -eq 0 ]; then
 [ ${HAVE_REALLOCARRAY} -eq 0 ] && \  
         echo "extern    void     *reallocarray(void *, size_t, size_t);"          echo "extern    void     *reallocarray(void *, size_t, size_t);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_reallocarray.o"
 [ ${HAVE_STRCASESTR} -eq 0 ] && \          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);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_recallocarray.o"
   fi
   if [ ${HAVE_STRCASESTR} -eq 0 ]; then
         echo "extern    char     *strcasestr(const char *, const char *);"          echo "extern    char     *strcasestr(const char *, const char *);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_strcasestr.o"
 [ ${HAVE_STRLCAT} -eq 0 ] && \  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);"          echo "extern    size_t    strlcat(char *, const char *, size_t);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_strlcat.o"
 [ ${HAVE_STRLCPY} -eq 0 ] && \  fi
   if [ ${HAVE_STRLCPY} -eq 0 ]; then
         echo "extern    size_t    strlcpy(char *, const char *, size_t);"          echo "extern    size_t    strlcpy(char *, const char *, size_t);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_strlcpy.o"
 [ ${HAVE_STRSEP} -eq 0 ] && \  fi
   if [ ${HAVE_STRNDUP} -eq 0 ]; then
           echo "extern    char     *strndup(const char *, size_t);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_strndup.o"
   fi
   if [ ${HAVE_STRSEP} -eq 0 ]; then
         echo "extern    char     *strsep(char **, const char *);"          echo "extern    char     *strsep(char **, const char *);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_strsep.o"
 [ ${HAVE_STRTONUM} -eq 0 ] && \  fi
   if [ ${HAVE_STRTONUM} -eq 0 ]; then
         echo "extern    long long strtonum(const char *, long long, long long, const char **);"          echo "extern    long long strtonum(const char *, long long, long long, const char **);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_strtonum.o"
 [ ${HAVE_VASPRINTF} -eq 0 ] && \  fi
   if [ ${HAVE_VASPRINTF} -eq 0 ]; then
         echo "extern    int       vasprintf(char **, const char *, va_list);"          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
   
 echo "config.h: written" 1>&2  
 echo "config.h: written" 1>&3  
   
 # --- tests for Makefile.local -----------------------------------------  # --- tests for Makefile.local -----------------------------------------
   
 exec > Makefile.local  exec > Makefile.local
   
 [ -z "${BINDIR}"     ] && BINDIR="${PREFIX}/bin"  [ -z "${BINDIR}"          ] && BINDIR="${PREFIX}/bin"
 [ -z "${SBINDIR}"    ] && SBINDIR="${PREFIX}/sbin"  [ -z "${SBINDIR}"         ] && SBINDIR="${PREFIX}/sbin"
 [ -z "${INCLUDEDIR}" ] && INCLUDEDIR="${PREFIX}/include/mandoc"  [ -z "${BIN_FROM_SBIN}"   ] && BIN_FROM_SBIN="../bin"
 [ -z "${LIBDIR}"     ] && LIBDIR="${PREFIX}/lib/mandoc"  [ -z "${INCLUDEDIR}"      ] && INCLUDEDIR="${PREFIX}/include/mandoc"
 [ -z "${MANDIR}"     ] && MANDIR="${PREFIX}/man"  [ -z "${LIBDIR}"          ] && LIBDIR="${PREFIX}/lib/mandoc"
   [ -z "${MANDIR}"          ] && MANDIR="${PREFIX}/man"
   
 [ -z "${HTDOCDIR}"   ] && HTDOCDIR="${WWWPREFIX}/htdocs"  [ -z "${HTDOCDIR}"        ] && HTDOCDIR="${WWWPREFIX}/htdocs"
 [ -z "${CGIBINDIR}"  ] && CGIBINDIR="${WWWPREFIX}/cgi-bin"  [ -z "${CGIBINDIR}"       ] && CGIBINDIR="${WWWPREFIX}/cgi-bin"
   
 [ -z "${INSTALL_PROGRAM}" ] && INSTALL_PROGRAM="${INSTALL} -m 0555"  [ -z "${INSTALL_PROGRAM}" ] && INSTALL_PROGRAM="${INSTALL} -m 0555"
 [ -z "${INSTALL_LIB}"     ] && INSTALL_LIB="${INSTALL} -m 0444"  [ -z "${INSTALL_LIB}"     ] && INSTALL_LIB="${INSTALL} -m 0444"
Line 483  CC  = ${CC}
Line 612  CC  = ${CC}
 CFLAGS          = ${CFLAGS}  CFLAGS          = ${CFLAGS}
 LDADD           = ${LDADD}  LDADD           = ${LDADD}
 LDFLAGS         = ${LDFLAGS}  LDFLAGS         = ${LDFLAGS}
   MANDOC_COBJS    = ${MANDOC_COBJS}
   SOELIM_COBJS    = ${SOELIM_COBJS}
 STATIC          = ${STATIC}  STATIC          = ${STATIC}
 PREFIX          = ${PREFIX}  PREFIX          = ${PREFIX}
 BINDIR          = ${BINDIR}  BINDIR          = ${BINDIR}
 SBINDIR         = ${SBINDIR}  SBINDIR         = ${SBINDIR}
   BIN_FROM_SBIN   = ${BIN_FROM_SBIN}
 INCLUDEDIR      = ${INCLUDEDIR}  INCLUDEDIR      = ${INCLUDEDIR}
 LIBDIR          = ${LIBDIR}  LIBDIR          = ${LIBDIR}
 MANDIR          = ${MANDIR}  MANDIR          = ${MANDIR}
Line 513  INSTALL_DATA = ${INSTALL_DATA}
Line 645  INSTALL_DATA = ${INSTALL_DATA}
 LN              = ${LN}  LN              = ${LN}
 __HEREDOC__  __HEREDOC__
   
 echo "Makefile.local: written" 1>&2  echo "file Makefile.local: written" 1>&2
 echo "Makefile.local: written" 1>&3  echo "file Makefile.local: written" 1>&3
   
 exit 0  exit 0
Legend:
Removed from v.1.59  
changed lines
  Added in v.1.76
CVSweb