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

Diff for /mandoc/configure between version 1.43.2.9 and 1.50

version 1.43.2.9, 2017/02/16 16:21:04 version 1.50, 2016/08/05 23:15:08
Line 2 
Line 2 
 #  #
 # $Id$  # $Id$
 #  #
 # Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>  # Copyright (c) 2014, 2015, 2016 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  MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/lo
Line 37  MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/lo
 OSNAME=  OSNAME=
 UTF8_LOCALE=  UTF8_LOCALE=
   
 CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`  CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -f -`
 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_SQLITE3=  
 STATIC="-static"  STATIC="-static"
   
 BUILD_DB=1  
 BUILD_CGI=0  BUILD_CGI=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_GETLINE=  HAVE_GETLINE=
 HAVE_GETSUBOPT=  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
 HAVE_MKDTEMP=  HAVE_MKDTEMP=
 HAVE_MMAP=  
 HAVE_NANOSLEEP=  HAVE_NANOSLEEP=
   HAVE_NTOHL=
   HAVE_OHASH=
   HAVE_PATH_MAX=
 HAVE_PLEDGE=  HAVE_PLEDGE=
 HAVE_PROGNAME=  HAVE_PROGNAME=
 HAVE_REALLOCARRAY=  HAVE_REALLOCARRAY=
Line 74  HAVE_STRLCPY=
Line 74  HAVE_STRLCPY=
 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 111  INSTALL_PROGRAM=
Line 107  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 134  COMP="${CC} ${CFLAGS} -Wno-unused -Werror"
Line 129  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 "${3}" ] && return 1          [ -z "${2}" ] && return 1
         echo "${1}: manual (HAVE_${2}=${3})" 1>&2          echo "${1}: manual (${2})" 1>&2
         echo "${1}: manual (HAVE_${2}=${3})" 1>&3          echo "${1}: manual (${2})" 1>&3
         echo 1>&3          echo 1>&3
         return 0          return 0
 }  }
Line 147  ismanual() {
Line 142  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}${3}: testing...  ${1}: testing...
 ${COMP} -o test-${1} test-${1}.c ${3}  ${COMP} ${3} -o test-${1} test-${1}.c
 __HEREDOC__  __HEREDOC__
   
         if ${COMP} -o "test-${1}" "test-${1}.c" ${3} 1>&3 2>&3; then          if ${COMP} ${3} -o "test-${1}" "test-${1}.c" 1>&3 2>&3; then
                 echo "${1}${3}: ${CC} succeeded" 1>&3                  echo "${1}: ${CC} succeeded" 1>&3
         else          else
                 echo "${1}${3}: ${CC} failed with $?" 1>&3                  echo "${1}: ${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}${3}: yes" 1>&2                  echo "${1}: yes" 1>&2
                 echo "${1}${3}: yes" 1>&3                  echo "${1}: 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}${3}: execution failed with $?" 1>&3                  echo "${1}: execution failed with $?" 1>&3
                 echo 1>&3                  echo 1>&3
                 rm "test-${1}"                  rm "test-${1}"
                 return 1                  return 1
Line 179  __HEREDOC__
Line 174  __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}" "${2}" "${_manual}" && return 0          ismanual "${1}" "${_manual}" && return 0
         singletest "${1}" "${2}" "${3}" && return 0          singletest "${1}" "${2}" "${3}" && return 0
         echo "${1}${3}: no" 1>&2          echo "${1}: no" 1>&2
         eval HAVE_${2}=0          eval HAVE_${2}=0
         return 1          return 1
 }  }
Line 189  runtest() {
Line 184  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" && 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 205  get_locale() {
Line 200  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 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 mmap            MMAP            || true  runtest ntohl           NTOHL           || 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 228  runtest strsep  STRSEP  || true
Line 226  runtest strsep  STRSEP  || true
 runtest strtonum        STRTONUM        || true  runtest strtonum        STRTONUM        || true
 runtest vasprintf       VASPRINTF       || true  runtest vasprintf       VASPRINTF       || true
   
 if ismanual fts FTS ${HAVE_FTS}; then  if [ ${HAVE_ENDIAN} -eq 0 -a \
         HAVE_FTS_COMPARE_CONST=0       ${HAVE_SYS_ENDIAN} -eq 0 -a \
 elif runtest fts FTS_COMPARE_CONST -DFTS_COMPARE_CONST; then       ${HAVE_NTOHL} -eq 0 ]; then
         HAVE_FTS=1          echo "FATAL: no endian conversion functions found" 1>&2
 else          echo "FATAL: no endian conversion functions found" 1>&3
         runtest fts FTS || true          exit 1
 fi  fi
   
 # --- wide character and locale support ---  # --- wide character and locale support ---
Line 245  else
Line 243  else
         echo "wchar: no (no UTF8_LOCALE)" 1>&3          echo "wchar: no (no UTF8_LOCALE)" 1>&3
 fi  fi
   
 # --- sqlite3 ---  
 if [ ${BUILD_DB} -eq 0 ]; then  
         echo "BUILD_DB=0 (manual)" 1>&2  
         echo "BUILD_DB=0 (manual)" 1>&3  
         echo 1>&3  
         HAVE_SQLITE3=0  
 elif ismanual sqlite3 SQLITE3 "${HAVE_SQLITE3}"; then  
         if [ -z "${LD_SQLITE3}" ]; then  
                 LD_SQLITE3="-lsqlite3"  
         fi  
 elif [ -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  
         LD_SQLITE3=  
         if [ ${BUILD_DB} -gt 0 ]; then  
                 echo "BUILD_DB=0 (no sqlite3)" 1>&2  
                 echo "BUILD_DB=0 (no sqlite3)" 1>&3  
                 echo 1>&3  
                 BUILD_DB=0  
         fi  
 fi  
   
 # --- sqlite3_errstr ---  
 if [ ${BUILD_DB} -eq 0 ]; then  
         HAVE_SQLITE3_ERRSTR=1  
 elif 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 299  if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
Line 258  if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
 fi  fi
   
 # --- ohash ---  # --- ohash ---
 if ismanual ohash OHASH "${HAVE_OHASH}"; then  if ismanual 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 313  if [ "${HAVE_OHASH}" -eq 0 ]; then
Line 272  if [ "${HAVE_OHASH}" -eq 0 ]; then
 fi  fi
   
 # --- LDADD ---  # --- LDADD ---
 LDADD="${LDADD} ${LD_SQLITE3} ${LD_NANOSLEEP} ${LD_OHASH} -lz"  LDADD="${LDADD} ${LD_NANOSLEEP} ${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 366  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
Line 310  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
 [ -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_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_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_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_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}
Line 390  cat << __HEREDOC__
Line 338  cat << __HEREDOC__
 #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 ${HAVE_SQLITE3}  
 #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_MAKEWHATIS "${BINM_MAKEWHATIS}"  #define BINM_MAKEWHATIS "${BINM_MAKEWHATIS}"
Line 432  fi
Line 378  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);"
   
 [ ${BUILD_DB} -gt 0 -a ${HAVE_SQLITE3_ERRSTR} -eq 0 ] &&  
         echo "extern    const char *sqlite3_errstr(int);"  
   
 [ ${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 474  exec > Makefile.local
Line 417  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"
   
 if [ ${BUILD_DB} -eq 0 -a ${BUILD_CGI} -gt 0 ]; then  BUILD_TARGETS=
         echo "BUILD_CGI=0 (no BUILD_DB)" 1>&2  [ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="cgi-build"
         echo "BUILD_CGI=0 (no BUILD_DB)" 1>&3  INSTALL_TARGETS=
         BUILD_CGI=0  [ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="cgi-install"
 fi  
   
 BUILD_TARGETS="base-build"  
 [ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="${BUILD_TARGETS} cgi-build"  
 INSTALL_TARGETS="base-install"  
 [ ${BUILD_DB}  -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} db-install"  
 [ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-install"  
   
 cat << __HEREDOC__  cat << __HEREDOC__
 BUILD_TARGETS   = ${BUILD_TARGETS}  BUILD_TARGETS   = ${BUILD_TARGETS}
 INSTALL_TARGETS = ${INSTALL_TARGETS}  INSTALL_TARGETS = ${INSTALL_TARGETS}
Line 519  INSTALL_PROGRAM = ${INSTALL_PROGRAM}
Line 455  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__
   
 [ ${BUILD_DB} -gt 0 ] && \  
         echo "MAIN_OBJS = \$(BASE_OBJS) \$(DB_OBJS)"  
   
 echo "Makefile.local: written" 1>&2  echo "Makefile.local: written" 1>&2
 echo "Makefile.local: written" 1>&3  echo "Makefile.local: written" 1>&3
Legend:
Removed from v.1.43.2.9  
changed lines
  Added in v.1.50
CVSweb