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

Diff for /mandoc/configure between version 1.76 and 1.80

version 1.76, 2020/06/22 20:00:38 version 1.80, 2021/09/19 15:05:39
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 68  HAVE_GETSUBOPT=
Line 68  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 107  BIN_FROM_SBIN=
Line 108  BIN_FROM_SBIN=
 INCLUDEDIR=  INCLUDEDIR=
 LIBDIR=  LIBDIR=
 MANDIR=  MANDIR=
 HOMEBREWDIR=  READ_ALLOWED_PATH=
   
 WWWPREFIX="/var/www"  WWWPREFIX="/var/www"
 HTDOCDIR=  HTDOCDIR=
Line 119  BINM_MAKEWHATIS="makewhatis"
Line 120  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 262  if [ -n "${CFLAGS}" ]; then
Line 264  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 306  runtest getline  GETLINE  || true
Line 308  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 343  else
Line 346  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 444  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
Line 463  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
 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_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"
Line 465  cat << __HEREDOC__
Line 485  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 493  cat << __HEREDOC__
Line 514  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 523  fi
Line 545  fi
 if [ ${HAVE_MKDTEMP} -eq 0 ]; then  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
   if [ ${HAVE_MKSTEMPS} -eq 0 ]; then
           echo "extern    int       mkstemps(char *, int);"
           MANDOC_COBJS="${MANDOC_COBJS} compat_mkstemps.o"
 fi  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"
Legend:
Removed from v.1.76  
changed lines
  Added in v.1.80
CVSweb