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

Diff for /mandoc/configure between version 1.50 and 1.62

version 1.50, 2016/08/05 23:15:08 version 1.62, 2017/03/04 16:36:29
Line 2 
Line 2 
 #  #
 # $Id$  # $Id$
 #  #
 # Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>  # Copyright (c) 2014, 2015, 2016, 2017 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 33  echo "config.log: writing..."
Line 33  echo "config.log: writing..."
 # 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_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"  MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"
 OSNAME=  OSNAME=
 UTF8_LOCALE=  UTF8_LOCALE=
   
 CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -f -`  CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
 CFLAGS="-g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings"  CFLAGS="-g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings"
 CFLAGS="${CFLAGS} -Wno-unused-parameter"  CFLAGS="${CFLAGS} -Wno-unused-parameter"
 LDADD=  LDADD=
 LDFLAGS=  LDFLAGS=
 LD_NANOSLEEP=  LD_NANOSLEEP=
 LD_OHASH=  LD_OHASH=
   LD_RECVMSG=
 STATIC="-static"  STATIC="-static"
   
 BUILD_CGI=0  BUILD_CGI=0
   BUILD_CATMAN=0
   INSTALL_LIBMANDOC=0
   
   HAVE_CMSG=
   HAVE_CMSG_XPG42=0
 HAVE_DIRENT_NAMLEN=  HAVE_DIRENT_NAMLEN=
 HAVE_EFTYPE=  HAVE_EFTYPE=
 HAVE_ENDIAN=  HAVE_ENDIAN=
 HAVE_ERR=  HAVE_ERR=
 HAVE_FTS=  HAVE_FTS=
   HAVE_FTS_COMPARE_CONST=
 HAVE_GETLINE=  HAVE_GETLINE=
 HAVE_GETSUBOPT=  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
 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_RECVMSG=
 HAVE_REWB_BSD=  HAVE_REWB_BSD=
 HAVE_REWB_SYSV=  HAVE_REWB_SYSV=
 HAVE_SANDBOX_INIT=  HAVE_SANDBOX_INIT=
Line 81  HAVE_WCHAR=
Line 91  HAVE_WCHAR=
 PREFIX="/usr/local"  PREFIX="/usr/local"
 BINDIR=  BINDIR=
 SBINDIR=  SBINDIR=
   BIN_FROM_SBIN=
 INCLUDEDIR=  INCLUDEDIR=
 LIBDIR=  LIBDIR=
 MANDIR=  MANDIR=
Line 91  HTDOCDIR=
Line 102  HTDOCDIR=
 CGIBINDIR=  CGIBINDIR=
   
 BINM_APROPOS="apropos"  BINM_APROPOS="apropos"
   BINM_CATMAN="catman"
 BINM_MAKEWHATIS="makewhatis"  BINM_MAKEWHATIS="makewhatis"
 BINM_MAN="man"  BINM_MAN="man"
 BINM_SOELIM="soelim"  BINM_SOELIM="soelim"
Line 107  INSTALL_PROGRAM=
Line 119  INSTALL_PROGRAM=
 INSTALL_LIB=  INSTALL_LIB=
 INSTALL_MAN=  INSTALL_MAN=
 INSTALL_DATA=  INSTALL_DATA=
   LN="ln -f"
   
 # --- manual settings from configure.local -----------------------------  # --- manual settings from configure.local -----------------------------
   
Line 129  COMP="${CC} ${CFLAGS} -Wno-unused -Werror"
Line 142  COMP="${CC} ${CFLAGS} -Wno-unused -Werror"
 # 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: lower-case test name, manual value
 ismanual() {  ismanual() {
         [ -z "${2}" ] && return 1          [ -z "${3}" ] && return 1
         echo "${1}: manual (${2})" 1>&2          echo "${1}: manual (HAVE_${2}=${3})" 1>&2
         echo "${1}: manual (${2})" 1>&3          echo "${1}: manual (HAVE_${2}=${3})" 1>&3
         echo 1>&3          echo 1>&3
         return 0          return 0
 }  }
Line 142  ismanual() {
Line 155  ismanual() {
 # Arguments: lower-case test name, upper-case test name, additional CFLAGS  # Arguments: lower-case test name, upper-case test name, additional CFLAGS
 singletest() {  singletest() {
         cat 1>&3 << __HEREDOC__          cat 1>&3 << __HEREDOC__
 ${1}: testing...  ${1}${3}: testing...
 ${COMP} ${3} -o test-${1} test-${1}.c  ${COMP} -o test-${1} test-${1}.c ${3}
 __HEREDOC__  __HEREDOC__
   
         if ${COMP} ${3} -o "test-${1}" "test-${1}.c" 1>&3 2>&3; then          if ${COMP} -o "test-${1}" "${SOURCEDIR}/test-${1}.c" ${3} 1>&3 2>&3
                 echo "${1}: ${CC} succeeded" 1>&3          then
                   echo "${1}${3}: ${CC} succeeded" 1>&3
         else          else
                 echo "${1}: ${CC} failed with $?" 1>&3                  echo "${1}${3}: ${CC} failed with $?" 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}: yes" 1>&2                  echo "${1}${3}: yes" 1>&2
                 echo "${1}: yes" 1>&3                  echo "${1}${3}: yes" 1>&3
                 echo 1>&3                  echo 1>&3
                 eval HAVE_${2}=1                  eval HAVE_${2}=1
                 rm "test-${1}"                  rm "test-${1}"
                 return 0                  return 0
         else          else
                 echo "${1}: execution failed with $?" 1>&3                  echo "${1}${3}: execution failed with $?" 1>&3
                 echo 1>&3                  echo 1>&3
                 rm "test-${1}"                  rm "test-${1}"
                 return 1                  return 1
Line 174  __HEREDOC__
Line 188  __HEREDOC__
 # Arguments: lower case name, upper case name, additional CFLAGS  # Arguments: lower case name, upper case name, additional CFLAGS
 runtest() {  runtest() {
         eval _manual=\${HAVE_${2}}          eval _manual=\${HAVE_${2}}
         ismanual "${1}" "${_manual}" && return 0          ismanual "${1}" "${2}" "${_manual}" && return 0
         singletest "${1}" "${2}" "${3}" && return 0          singletest "${1}" "${2}" "${3}" && return 0
         echo "${1}: no" 1>&2          echo "${1}${3}: no" 1>&2
         eval HAVE_${2}=0          eval HAVE_${2}=0
         return 1          return 1
 }  }
Line 184  runtest() {
Line 198  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" && return 0          ismanual UTF8_LOCALE UTF8_LOCALE "$UTF8_LOCALE" && return 0
         echo "UTF8_LOCALE: testing..." 1>&3          echo "UTF8_LOCALE: testing..." 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
Line 204  runtest be32toh  ENDIAN  || true
Line 218  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 fts             FTS             || true  
 runtest getline         GETLINE         || true  runtest getline         GETLINE         || true
 runtest getsubopt       GETSUBOPT       || true  runtest getsubopt       GETSUBOPT       || true
 runtest isblank         ISBLANK         || true  runtest isblank         ISBLANK         || true
 runtest mkdtemp         MKDTEMP         || true  runtest mkdtemp         MKDTEMP         || 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
Line 234  if [ ${HAVE_ENDIAN} -eq 0 -a \
Line 248  if [ ${HAVE_ENDIAN} -eq 0 -a \
         exit 1          exit 1
 fi  fi
   
   if ismanual fts FTS ${HAVE_FTS}; then
           HAVE_FTS_COMPARE_CONST=0
   elif runtest fts FTS_COMPARE_CONST -DFTS_COMPARE_CONST; then
           HAVE_FTS=1
   else
           runtest fts FTS || true
   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}\" || true
Line 257  if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
Line 279  if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
         exit 1          exit 1
 fi  fi
   
   if [ ${BUILD_CATMAN} -gt 0 ]; then
           # --- recvmsg ---
           if [ -n "${LD_RECVMSG}" ]; then
                   runtest recvmsg RECVMSG "${LD_RECVMSG}" || true
           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
   
 # --- ohash ---  # --- ohash ---
 if ismanual ohash "${HAVE_OHASH}"; then  if ismanual ohash OHASH "${HAVE_OHASH}"; then
         :          :
 elif [ -n "${LD_OHASH}" ]; then  elif [ -n "${LD_OHASH}" ]; then
         runtest ohash OHASH "${LD_OHASH}" || true          runtest ohash OHASH "${LD_OHASH}" || true
Line 272  if [ "${HAVE_OHASH}" -eq 0 ]; then
Line 324  if [ "${HAVE_OHASH}" -eq 0 ]; then
 fi  fi
   
 # --- LDADD ---  # --- LDADD ---
 LDADD="${LDADD} ${LD_NANOSLEEP} ${LD_OHASH} -lz"  LDADD="${LDADD} ${LD_NANOSLEEP} ${LD_RECVMSG} ${LD_OHASH} -lz"
 echo "LDADD=\"${LDADD}\"" 1>&2  echo "LDADD=\"${LDADD}\"" 1>&2
 echo "LDADD=\"${LDADD}\"" 1>&3  echo "LDADD=\"${LDADD}\"" 1>&3
 echo 1>&3  echo 1>&3
Line 309  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
Line 361  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
 [ -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_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"
Line 316  if [ ${HAVE_ENDIAN} -eq 0 -a ${HAVE_SYS_ENDIAN} -eq 0 
Line 369  if [ ${HAVE_ENDIAN} -eq 0 -a ${HAVE_SYS_ENDIAN} -eq 0 
 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}
 #define HAVE_FTS ${HAVE_FTS}  #define HAVE_FTS ${HAVE_FTS}
   #define HAVE_FTS_COMPARE_CONST ${HAVE_FTS_COMPARE_CONST}
 #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}
Line 344  cat << __HEREDOC__
Line 399  cat << __HEREDOC__
 #define HAVE_OHASH ${HAVE_OHASH}  #define HAVE_OHASH ${HAVE_OHASH}
   
 #define BINM_APROPOS "${BINM_APROPOS}"  #define BINM_APROPOS "${BINM_APROPOS}"
   #define BINM_CATMAN "${BINM_CATMAN}"
 #define BINM_MAKEWHATIS "${BINM_MAKEWHATIS}"  #define BINM_MAKEWHATIS "${BINM_MAKEWHATIS}"
 #define BINM_MAN "${BINM_MAN}"  #define BINM_MAN "${BINM_MAN}"
 #define BINM_SOELIM "${BINM_SOELIM}"  #define BINM_SOELIM "${BINM_SOELIM}"
Line 403  echo "config.h: written" 1>&3
Line 459  echo "config.h: written" 1>&3
   
 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 418  exec > Makefile.local
Line 475  exec > Makefile.local
 [ -z "${INSTALL_DATA}"    ] && INSTALL_DATA="${INSTALL} -m 0444"  [ -z "${INSTALL_DATA}"    ] && INSTALL_DATA="${INSTALL} -m 0444"
   
 BUILD_TARGETS=  BUILD_TARGETS=
 [ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="cgi-build"  [ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="man.cgi"
   [ ${BUILD_CATMAN} -gt 0 ] && \
           BUILD_TARGETS="${BUILD_TARGETS} mandocd catman"
 INSTALL_TARGETS=  INSTALL_TARGETS=
 [ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="cgi-install"  [ ${INSTALL_LIBMANDOC} -gt 0 ] && INSTALL_TARGETS="lib-install"
   [ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-install"
   [ ${BUILD_CATMAN} -gt 0 ] && \
           INSTALL_TARGETS="${INSTALL_TARGETS} catman-install"
   
 cat << __HEREDOC__  cat << __HEREDOC__
 BUILD_TARGETS   = ${BUILD_TARGETS}  BUILD_TARGETS   = ${BUILD_TARGETS}
Line 433  STATIC  = ${STATIC}
Line 495  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 440  WWWPREFIX = ${WWWPREFIX}
Line 503  WWWPREFIX = ${WWWPREFIX}
 HTDOCDIR        = ${HTDOCDIR}  HTDOCDIR        = ${HTDOCDIR}
 CGIBINDIR       = ${CGIBINDIR}  CGIBINDIR       = ${CGIBINDIR}
 BINM_APROPOS    = ${BINM_APROPOS}  BINM_APROPOS    = ${BINM_APROPOS}
   BINM_CATMAN     = ${BINM_CATMAN}
 BINM_MAKEWHATIS = ${BINM_MAKEWHATIS}  BINM_MAKEWHATIS = ${BINM_MAKEWHATIS}
 BINM_MAN        = ${BINM_MAN}  BINM_MAN        = ${BINM_MAN}
 BINM_SOELIM     = ${BINM_SOELIM}  BINM_SOELIM     = ${BINM_SOELIM}
Line 455  INSTALL_PROGRAM = ${INSTALL_PROGRAM}
Line 519  INSTALL_PROGRAM = ${INSTALL_PROGRAM}
 INSTALL_LIB     = ${INSTALL_LIB}  INSTALL_LIB     = ${INSTALL_LIB}
 INSTALL_MAN     = ${INSTALL_MAN}  INSTALL_MAN     = ${INSTALL_MAN}
 INSTALL_DATA    = ${INSTALL_DATA}  INSTALL_DATA    = ${INSTALL_DATA}
   LN              = ${LN}
 __HEREDOC__  __HEREDOC__
   
 echo "Makefile.local: written" 1>&2  echo "Makefile.local: written" 1>&2
Legend:
Removed from v.1.50  
changed lines
  Added in v.1.62
CVSweb