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

Diff for /mandoc/configure between version 1.43.2.13 and 1.65

version 1.43.2.13, 2017/03/04 16:44:43 version 1.65, 2018/02/27 11:16:23
Line 35  echo "config.log: writing..."
Line 35  echo "config.log: writing..."
   
 SOURCEDIR=`dirname "$0"`  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"
 OSNAME=  OSNAME=
 UTF8_LOCALE=  UTF8_LOCALE=
Line 46  LDADD=
Line 47  LDADD=
 LDFLAGS=  LDFLAGS=
 LD_NANOSLEEP=  LD_NANOSLEEP=
 LD_OHASH=  LD_OHASH=
 LD_SQLITE3=  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_ERR=  HAVE_ERR=
 HAVE_FTS=  HAVE_FTS=
 HAVE_FTS_COMPARE_CONST=  HAVE_FTS_COMPARE_CONST=
Line 60  HAVE_GETLINE=
Line 66  HAVE_GETLINE=
 HAVE_GETSUBOPT=  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
 HAVE_MKDTEMP=  HAVE_MKDTEMP=
 HAVE_MMAP=  
 HAVE_NANOSLEEP=  HAVE_NANOSLEEP=
   HAVE_NTOHL=
   HAVE_O_DIRECTORY=
   HAVE_OHASH=
   HAVE_PATH_MAX=
 HAVE_PLEDGE=  HAVE_PLEDGE=
 HAVE_PROGNAME=  HAVE_PROGNAME=
 HAVE_REALLOCARRAY=  HAVE_REALLOCARRAY=
   HAVE_RECALLOCARRAY=
   HAVE_RECVMSG=
 HAVE_REWB_BSD=  HAVE_REWB_BSD=
 HAVE_REWB_SYSV=  HAVE_REWB_SYSV=
 HAVE_SANDBOX_INIT=  HAVE_SANDBOX_INIT=
Line 72  HAVE_STRCASESTR=
Line 83  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=
   HAVE_SYS_ENDIAN=
 HAVE_VASPRINTF=  HAVE_VASPRINTF=
 HAVE_WCHAR=  HAVE_WCHAR=
   
 HAVE_SQLITE3=  
 HAVE_SQLITE3_ERRSTR=  
 HAVE_OHASH=  
 HAVE_MANPATH=  
   
 PREFIX="/usr/local"  PREFIX="/usr/local"
 BINDIR=  BINDIR=
 SBINDIR=  SBINDIR=
Line 97  HTDOCDIR=
Line 105  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 208  get_locale() {
Line 217  get_locale() {
   
 # --- library functions ---  # --- library functions ---
 runtest dirent-namlen   DIRENT_NAMLEN   || true  runtest dirent-namlen   DIRENT_NAMLEN   || true
   runtest be32toh         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       || true
 runtest isblank         ISBLANK         || true  runtest isblank         ISBLANK         || true
 runtest mkdtemp         MKDTEMP         || true  runtest mkdtemp         MKDTEMP         || true
 runtest mmap            MMAP            || 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    || true
   runtest recallocarray   RECALLOCARRAY   || 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      || 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 strndup         STRNDUP         || true
 runtest strptime        STRPTIME        || true  runtest strptime        STRPTIME        || true
 runtest strsep          STRSEP          || true  runtest strsep          STRSEP          || true
 runtest strtonum        STRTONUM        || true  runtest strtonum        STRTONUM        || true
 runtest vasprintf       VASPRINTF       || true  runtest vasprintf       VASPRINTF       || true
   
   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
           exit 1
   fi
   
 if ismanual fts FTS ${HAVE_FTS}; then  if ismanual fts FTS ${HAVE_FTS}; then
         HAVE_FTS_COMPARE_CONST=0          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
Line 248  else
Line 270  else
         echo "wchar: no (no UTF8_LOCALE)" 1>&3          echo "wchar: no (no UTF8_LOCALE)" 1>&3
 fi  fi
   
 # --- sqlite3 ---  
 if [ -n "${LD_SQLITE3}" ]; then  
         runtest sqlite3 SQLITE3 "${LD_SQLITE3}" || true  
 elif singletest sqlite3 SQLITE3 "-lsqlite3"; then  
         LD_SQLITE3="-lsqlite3"  
 elif runtest sqlite3 SQLITE3 \  
                 "-I/usr/local/include -L/usr/local/lib -lsqlite3"; then  
         LD_SQLITE3="-L/usr/local/lib -lsqlite3"  
         CFLAGS="${CFLAGS} -I/usr/local/include"  
         COMP="${COMP} -I/usr/local/include"  
 fi  
 if [ ${HAVE_SQLITE3} -eq 0 ]; then  
         echo "FATAL: no sqlite3" 1>&2  
         echo "FATAL: no sqlite3" 1>&3  
         echo "Use release 1.14.1 to build without SQLite." 1>&2  
         exit 1  
 fi  
   
 # --- sqlite3_errstr ---  
 if ismanual sqlite3_errstr SQLITE3_ERRSTR "${HAVE_SQLITE3_ERRSTR}"; then  
         :  
 else  
         runtest sqlite3_errstr SQLITE3_ERRSTR "${LD_SQLITE3}" || true  
 fi  
   
 # --- nanosleep ---  # --- nanosleep ---
 if [ -n "${LD_NANOSLEEP}" ]; then  if [ -n "${LD_NANOSLEEP}" ]; then
         runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" || true          runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" || true
Line 287  if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
Line 284  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 OHASH "${HAVE_OHASH}"; then  if ismanual ohash OHASH "${HAVE_OHASH}"; then
         :          :
Line 302  if [ "${HAVE_OHASH}" -eq 0 ]; then
Line 329  if [ "${HAVE_OHASH}" -eq 0 ]; then
 fi  fi
   
 # --- LDADD ---  # --- LDADD ---
 LDADD="${LDADD} ${LD_SQLITE3} ${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
   
 # --- manpath ---  
 if ismanual manpath MANPATH "${HAVE_MANPATH}"; then  
         :  
 elif manpath 1>&3 2>&3; then  
         echo "manpath: yes" 1>&2  
         echo "manpath: yes" 1>&3  
         echo 1>&3  
         HAVE_MANPATH=1  
 else  
         echo "manpath: no" 1>&2  
         echo "manpath: no" 1>&3  
         echo 1>&3  
         HAVE_MANPATH=0  
 fi  
   
 # --- write config.h ---  # --- write config.h ---
   
 exec > config.h  exec > config.h
Line 341  cat << __HEREDOC__
Line 353  cat << __HEREDOC__
   
 __HEREDOC__  __HEREDOC__
   
 [ ${HAVE_GETLINE} -eq 0 -o ${HAVE_REALLOCARRAY} -eq 0 -o \  [ ${HAVE_GETLINE} -eq 0 -o \
   ${HAVE_STRLCAT} -eq 0 -o ${HAVE_STRLCPY} -eq 0 ] \    ${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}\""
 [ -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_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
           echo "#define be32toh ntohl"
           echo "#define htobe32 htonl"
   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_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_FTS_COMPARE_CONST ${HAVE_FTS_COMPARE_CONST}
Line 365  cat << __HEREDOC__
Line 387  cat << __HEREDOC__
 #define HAVE_GETSUBOPT ${HAVE_GETSUBOPT}  #define HAVE_GETSUBOPT ${HAVE_GETSUBOPT}
 #define HAVE_ISBLANK ${HAVE_ISBLANK}  #define HAVE_ISBLANK ${HAVE_ISBLANK}
 #define HAVE_MKDTEMP ${HAVE_MKDTEMP}  #define HAVE_MKDTEMP ${HAVE_MKDTEMP}
 #define HAVE_MMAP ${HAVE_MMAP}  #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 376  cat << __HEREDOC__
Line 399  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}
   #define HAVE_SYS_ENDIAN ${HAVE_SYS_ENDIAN}
 #define HAVE_VASPRINTF ${HAVE_VASPRINTF}  #define HAVE_VASPRINTF ${HAVE_VASPRINTF}
 #define HAVE_WCHAR ${HAVE_WCHAR}  #define HAVE_WCHAR ${HAVE_WCHAR}
 #define HAVE_SQLITE3_ERRSTR ${HAVE_SQLITE3_ERRSTR}  
 #define HAVE_OHASH ${HAVE_OHASH}  #define HAVE_OHASH ${HAVE_OHASH}
 #define HAVE_MANPATH ${HAVE_MANPATH}  
   
 #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 420  fi
Line 444  fi
 [ ${HAVE_REALLOCARRAY} -eq 0 ] && \  [ ${HAVE_REALLOCARRAY} -eq 0 ] && \
         echo "extern    void     *reallocarray(void *, size_t, size_t);"          echo "extern    void     *reallocarray(void *, size_t, size_t);"
   
 [ ${HAVE_SQLITE3_ERRSTR} -eq 0 ] &&  [ ${HAVE_RECALLOCARRAY} -eq 0 ] && \
         echo "extern    const char *sqlite3_errstr(int);"          echo "extern    void     *recallocarray(void *, size_t, size_t, size_t);"
   
 [ ${HAVE_STRCASESTR} -eq 0 ] && \  [ ${HAVE_STRCASESTR} -eq 0 ] && \
         echo "extern    char     *strcasestr(const char *, const char *);"          echo "extern    char     *strcasestr(const char *, const char *);"
Line 432  fi
Line 456  fi
 [ ${HAVE_STRLCPY} -eq 0 ] && \  [ ${HAVE_STRLCPY} -eq 0 ] && \
         echo "extern    size_t    strlcpy(char *, const char *, size_t);"          echo "extern    size_t    strlcpy(char *, const char *, size_t);"
   
   [ ${HAVE_STRNDUP} -eq 0 ] && \
           echo "extern    char     *strndup(const char *, size_t);"
   
 [ ${HAVE_STRSEP} -eq 0 ] && \  [ ${HAVE_STRSEP} -eq 0 ] && \
         echo "extern    char     *strsep(char **, const char *);"          echo "extern    char     *strsep(char **, const char *);"
   
Line 463  exec > Makefile.local
Line 490  exec > Makefile.local
 [ -z "${INSTALL_MAN}"     ] && INSTALL_MAN="${INSTALL} -m 0444"  [ -z "${INSTALL_MAN}"     ] && INSTALL_MAN="${INSTALL} -m 0444"
 [ -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="${BUILD_TARGETS} man.cgi"  [ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="man.cgi"
 INSTALL_TARGETS="base-install db-install"  [ ${BUILD_CATMAN} -gt 0 ] && \
           BUILD_TARGETS="${BUILD_TARGETS} mandocd catman"
   INSTALL_TARGETS=
   [ ${INSTALL_LIBMANDOC} -gt 0 ] && INSTALL_TARGETS="lib-install"
 [ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-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 487  WWWPREFIX = ${WWWPREFIX}
Line 519  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}
Legend:
Removed from v.1.43.2.13  
changed lines
  Added in v.1.65
CVSweb