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

Diff for /mandoc/configure between version 1.75 and 1.82

version 1.75, 2020/06/15 01:37:15 version 1.82, 2022/04/14 16:43:43
Line 2 
Line 2 
 #  #
 # $Id$  # $Id$
 #  #
 # 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  # 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 37  SOURCEDIR=`dirname "${0}"`
Line 37  SOURCEDIR=`dirname "${0}"`
   
 MANPATH_BASE="/usr/share/man:/usr/X11R6/man"  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"
   DEBUG_MEMORY=0
 OSENUM=  OSENUM=
 OSNAME=  OSNAME=
 UTF8_LOCALE=  UTF8_LOCALE=
   
   AR=ar
 CC=cc  CC=cc
 CFLAGS=  CFLAGS=
 FATAL=0  FATAL=0
Line 55  BUILD_CGI=0
Line 57  BUILD_CGI=0
 BUILD_CATMAN=0  BUILD_CATMAN=0
 INSTALL_LIBMANDOC=0  INSTALL_LIBMANDOC=0
   
   HAVE_ATTRIBUTE=
 HAVE_CMSG=  HAVE_CMSG=
 HAVE_DIRENT_NAMLEN=  HAVE_DIRENT_NAMLEN=
 HAVE_EFTYPE=  HAVE_EFTYPE=
Line 67  HAVE_GETSUBOPT=
Line 70  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
 HAVE_LESS_T=  HAVE_LESS_T=
 HAVE_MKDTEMP=  HAVE_MKDTEMP=
   HAVE_MKSTEMPS=
 HAVE_NANOSLEEP=  HAVE_NANOSLEEP=
 HAVE_NTOHL=  HAVE_NTOHL=
 HAVE_O_DIRECTORY=  HAVE_O_DIRECTORY=
Line 96  NEED_GNU_SOURCE=0
Line 100  NEED_GNU_SOURCE=0
 NEED_OPENBSD_SOURCE=0  NEED_OPENBSD_SOURCE=0
 NEED_XPG4_2=0  NEED_XPG4_2=0
   
   DEBUG_OBJS=
 MANDOC_COBJS=  MANDOC_COBJS=
 SOELIM_COBJS=  SOELIM_COBJS=
   
Line 106  BIN_FROM_SBIN=
Line 111  BIN_FROM_SBIN=
 INCLUDEDIR=  INCLUDEDIR=
 LIBDIR=  LIBDIR=
 MANDIR=  MANDIR=
 HOMEBREWDIR=  READ_ALLOWED_PATH=
   
 WWWPREFIX="/var/www"  WWWPREFIX="/var/www"
 HTDOCDIR=  HTDOCDIR=
Line 118  BINM_MAKEWHATIS="makewhatis"
Line 123  BINM_MAKEWHATIS="makewhatis"
 BINM_MAN="man"  BINM_MAN="man"
 BINM_SOELIM="soelim"  BINM_SOELIM="soelim"
 BINM_WHATIS="whatis"  BINM_WHATIS="whatis"
   BINM_PAGER=
 MANM_MAN="man"  MANM_MAN="man"
 MANM_MANCONF="man.conf"  MANM_MANCONF="man.conf"
 MANM_MDOC="mdoc"  MANM_MDOC="mdoc"
Line 261  if [ -n "${CFLAGS}" ]; then
Line 267  if [ -n "${CFLAGS}" ]; then
 else  else
         COMP="${CC} ${DEFCFLAGS} -Wno-unused -Werror"          COMP="${CC} ${DEFCFLAGS} -Wno-unused -Werror"
 fi  fi
 echo -n "tested ${CC} -W: " 1>&2  printf "%s" "tested ${CC} -W: " 1>&2
 echo -n "testing ${CC} -W: " 1>&3  printf "%s" "testing ${CC} -W: " 1>&3
 runtest noop WFLAG || true  runtest noop WFLAG || true
   
 if [ -n "${CFLAGS}" ]; then  if [ -n "${CFLAGS}" ]; then
Line 294  fi
Line 300  fi
 # --- tests for config.h  ----------------------------------------------  # --- tests for config.h  ----------------------------------------------
   
 # --- library functions ---  # --- library functions ---
   runtest attribute       ATTRIBUTE       || true
 runtest cmsg            CMSG            "" "-D_XPG4_2" || 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
Line 304  runtest getline  GETLINE  || true
Line 311  runtest getline  GETLINE  || true
 runtest getsubopt       GETSUBOPT       "" -D_GNU_SOURCE || 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 mkstemps        MKSTEMPS        || true
 runtest nanosleep       NANOSLEEP       "${LD_NANOSLEEP}" "-lrt" || true  runtest nanosleep       NANOSLEEP       "${LD_NANOSLEEP}" "-lrt" || true
 runtest ntohl           NTOHL           || true  runtest ntohl           NTOHL           || true
 runtest O_DIRECTORY     O_DIRECTORY     || true  runtest O_DIRECTORY     O_DIRECTORY     || true
Line 328  runtest vasprintf VASPRINTF "" -D_GNU_SOURCE || true
Line 336  runtest vasprintf VASPRINTF "" -D_GNU_SOURCE || true
   
 # --- fts ---  # --- fts ---
 if [ "${1}" = "-depend" ]; then  if [ "${1}" = "-depend" ]; then
           DEBUG_MEMORY=1
         HAVE_FTS=0          HAVE_FTS=0
         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>&2
Line 341  else
Line 350  else
         runtest fts FTS || true          runtest fts FTS || true
 fi  fi
   
   # --- pager ---
   manual=
   if [ -n "${BINM_PAGER}" ]; then
           manual=" (manual)"
   elif less test-noop.c 1>/dev/null 2>&3; then
           BINM_PAGER=less
           echo "tested less: yes" 1>&2
           echo "tested less: yes" 1>&3
   else
           BINM_PAGER=more
           echo "tested less: no" 1>&2
           echo "tested less: no" 1>&3
   fi
   echo "selected BINM_PAGER=${BINM_PAGER}${manual}" 1>&2
   echo "selected BINM_PAGER=${BINM_PAGER}${manual}" 1>&3
   
 # --- tagging support in the pager ---  # --- tagging support in the pager ---
 if ismanual "less -T" LESS_T ${HAVE_LESS_T}; then  if ismanual "${BINM_PAGER} -T" LESS_T ${HAVE_LESS_T}; then
         :          :
 elif less -ET /dev/null test-noop.c 1>/dev/null 2>&3; then  elif ${BINM_PAGER} -T /dev/null test-noop.c 1>/dev/null 2>&3; then
         HAVE_LESS_T=1          HAVE_LESS_T=1
         echo "tested less -T: yes" 1>&2          echo "tested ${BINM_PAGER} -T: yes" 1>&2
         echo "tested less -T: yes" 1>&3          echo "tested ${BINM_PAGER} -T: yes" 1>&3
         echo 1>&3          echo 1>&3
 else  else
         HAVE_LESS_T=0          HAVE_LESS_T=0
         echo "tested less -T: no" 1>&2          echo "tested ${BINM_PAGER} -T: no" 1>&2
         echo "tested less -T: no" 1>&3          echo "tested ${BINM_PAGER} -T: no" 1>&3
         echo 1>&3          echo 1>&3
 fi  fi
   
Line 422  cat << __HEREDOC__
Line 447  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  
   
 __HEREDOC__  __HEREDOC__
   
 [ ${NEED_GNU_SOURCE} -eq 0 ] || echo "#define _GNU_SOURCE"  [ ${NEED_GNU_SOURCE} -eq 0 ] || echo "#define _GNU_SOURCE"
Line 443  echo
Line 464  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_BASE \"${MANPATH_BASE}\""
 echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""  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}"  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 "${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_EFTYPE} -eq 0 ] && echo "#define EFTYPE EINVAL"
 [ ${HAVE_O_DIRECTORY} -eq 0 ] && echo "#define O_DIRECTORY 0"  [ ${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"
Line 466  cat << __HEREDOC__
Line 493  cat << __HEREDOC__
 #define HAVE_ISBLANK ${HAVE_ISBLANK}  #define HAVE_ISBLANK ${HAVE_ISBLANK}
 #define HAVE_LESS_T ${HAVE_LESS_T}  #define HAVE_LESS_T ${HAVE_LESS_T}
 #define HAVE_MKDTEMP ${HAVE_MKDTEMP}  #define HAVE_MKDTEMP ${HAVE_MKDTEMP}
   #define HAVE_MKSTEMPS ${HAVE_MKSTEMPS}
 #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}
Line 494  cat << __HEREDOC__
Line 522  cat << __HEREDOC__
 #define BINM_MAN "${BINM_MAN}"  #define BINM_MAN "${BINM_MAN}"
 #define BINM_SOELIM "${BINM_SOELIM}"  #define BINM_SOELIM "${BINM_SOELIM}"
 #define BINM_WHATIS "${BINM_WHATIS}"  #define BINM_WHATIS "${BINM_WHATIS}"
   #define BINM_PAGER "${BINM_PAGER}"
   
 __HEREDOC__  __HEREDOC__
   
Line 525  if [ ${HAVE_MKDTEMP} -eq 0 ]; then
Line 554  if [ ${HAVE_MKDTEMP} -eq 0 ]; then
         echo "extern    char     *mkdtemp(char *);"          echo "extern    char     *mkdtemp(char *);"
         MANDOC_COBJS="${MANDOC_COBJS} compat_mkdtemp.o"          MANDOC_COBJS="${MANDOC_COBJS} compat_mkdtemp.o"
 fi  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  if [ ${HAVE_OHASH} -eq 0 ]; then
         MANDOC_COBJS="${MANDOC_COBJS} compat_ohash.o"          MANDOC_COBJS="${MANDOC_COBJS} compat_ohash.o"
 fi  fi
Line 609  INSTALL_TARGETS=
Line 642  INSTALL_TARGETS=
 cat << __HEREDOC__  cat << __HEREDOC__
 BUILD_TARGETS   = ${BUILD_TARGETS}  BUILD_TARGETS   = ${BUILD_TARGETS}
 INSTALL_TARGETS = ${INSTALL_TARGETS}  INSTALL_TARGETS = ${INSTALL_TARGETS}
   AR              = ${AR}
 CC              = ${CC}  CC              = ${CC}
 CFLAGS          = ${CFLAGS}  CFLAGS          = ${CFLAGS}
 LDADD           = ${LDADD}  LDADD           = ${LDADD}
 LDFLAGS         = ${LDFLAGS}  LDFLAGS         = ${LDFLAGS}
   DEBUG_OBJS      = ${DEBUG_OBJS}
 MANDOC_COBJS    = ${MANDOC_COBJS}  MANDOC_COBJS    = ${MANDOC_COBJS}
 SOELIM_COBJS    = ${SOELIM_COBJS}  SOELIM_COBJS    = ${SOELIM_COBJS}
 STATIC          = ${STATIC}  STATIC          = ${STATIC}
Legend:
Removed from v.1.75  
changed lines
  Added in v.1.82
CVSweb