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

Diff for /mandoc/configure between version 1.43.2.1 and 1.43.2.6

version 1.43.2.1, 2016/07/20 14:14:07 version 1.43.2.6, 2016/10/20 18:52:27
Line 35  echo "config.log: writing..."
Line 35  echo "config.log: writing..."
   
 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=
   
 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=
Line 50  BUILD_DB=1
Line 51  BUILD_DB=1
 BUILD_CGI=0  BUILD_CGI=0
   
 HAVE_DIRENT_NAMLEN=  HAVE_DIRENT_NAMLEN=
   HAVE_EFTYPE=
 HAVE_ERR=  HAVE_ERR=
 HAVE_FTS=  HAVE_FTS=
   HAVE_FTS_COMPARE_CONST=
 HAVE_GETLINE=  HAVE_GETLINE=
 HAVE_GETSUBOPT=  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
Line 130  COMP="${CC} ${CFLAGS} -Wno-unused -Werror"
Line 133  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 143  ismanual() {
Line 146  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} ${3} -o test-${1} test-${1}.c
 __HEREDOC__  __HEREDOC__
   
         if ${COMP} ${3} -o "test-${1}" "test-${1}.c" 1>&3 2>&3; then          if ${COMP} ${3} -o "test-${1}" "test-${1}.c" 1>&3 2>&3; then
                 echo "${1}: ${CC} succeeded" 1>&3                  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 175  __HEREDOC__
Line 178  __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
 }  }
   
   # Select a UTF-8 locale.
   get_locale() {
           [ -n "${HAVE_WCHAR}" ] && [ "${HAVE_WCHAR}" -eq 0 ] && return 0
           ismanual UTF8_LOCALE UTF8_LOCALE "$UTF8_LOCALE" && return 0
           echo "UTF8_LOCALE: testing..." 1>&3
           UTF8_LOCALE=`locale -a | grep -i '^en_US\.UTF-*8$' | head -n 1`
           if [ -z "${UTF8_LOCALE}" ]; then
                   UTF8_LOCALE=`locale -a | grep -i '\.UTF-*8' | head -n 1`
                   [ -n "${UTF8_LOCALE}" ] || return 1
           fi
           echo "UTF8_LOCALE=${UTF8_LOCALE}" 1>&2
           echo "UTF8_LOCALE=${UTF8_LOCALE}" 1>&3
           echo 1>&3
           return 0;
   }
   
   
 # --- library functions ---  # --- library functions ---
 runtest dirent-namlen   DIRENT_NAMLEN   || true  runtest dirent-namlen   DIRENT_NAMLEN   || 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 mmap            MMAP            || 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
Line 205  runtest strptime STRPTIME || true
Line 226  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
 runtest wchar           WCHAR           || true  
   
   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 ---
   if get_locale; then
           runtest wchar WCHAR -DUTF8_LOCALE=\"${UTF8_LOCALE}\" || true
   else
           HAVE_WCHAR=0
           echo "wchar: no (no UTF8_LOCALE)" 1>&2
           echo "wchar: no (no UTF8_LOCALE)" 1>&3
   fi
   
 # --- sqlite3 ---  # --- sqlite3 ---
 if [ ${BUILD_DB} -eq 0 ]; then  if [ ${BUILD_DB} -eq 0 ]; then
         echo "BUILD_DB=0 (manual)" 1>&2          echo "BUILD_DB=0 (manual)" 1>&2
         echo "BUILD_DB=0 (manual)" 1>&3          echo "BUILD_DB=0 (manual)" 1>&3
         echo 1>&3          echo 1>&3
         HAVE_SQLITE3=0          HAVE_SQLITE3=0
 elif ismanual sqlite3 "${HAVE_SQLITE3}"; then  elif ismanual sqlite3 SQLITE3 "${HAVE_SQLITE3}"; then
         if [ -z "${LD_SQLITE3}" ]; then          if [ -z "${LD_SQLITE3}" ]; then
                 LD_SQLITE3="-lsqlite3"                  LD_SQLITE3="-lsqlite3"
         fi          fi
Line 239  fi
Line 276  fi
 # --- sqlite3_errstr ---  # --- sqlite3_errstr ---
 if [ ${BUILD_DB} -eq 0 ]; then  if [ ${BUILD_DB} -eq 0 ]; then
         HAVE_SQLITE3_ERRSTR=1          HAVE_SQLITE3_ERRSTR=1
 elif ismanual sqlite3_errstr "${HAVE_SQLITE3_ERRSTR}"; then  elif ismanual sqlite3_errstr SQLITE3_ERRSTR "${HAVE_SQLITE3_ERRSTR}"; then
         :          :
 else  else
         runtest sqlite3_errstr SQLITE3_ERRSTR "${LD_SQLITE3}" || true          runtest sqlite3_errstr SQLITE3_ERRSTR "${LD_SQLITE3}" || true
Line 260  if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
Line 297  if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
 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 280  echo "LDADD=\"${LDADD}\"" 1>&3
Line 317  echo "LDADD=\"${LDADD}\"" 1>&3
 echo 1>&3  echo 1>&3
   
 # --- manpath ---  # --- manpath ---
 if ismanual manpath "${HAVE_MANPATH}"; then  if ismanual manpath MANPATH "${HAVE_MANPATH}"; then
         :          :
 elif manpath 1>&3 2>&3; then  elif manpath 1>&3 2>&3; then
         echo "manpath: yes" 1>&2          echo "manpath: yes" 1>&2
Line 323  echo
Line 360  echo
 echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""  echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""
 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 "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""  [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""
   [ ${HAVE_EFTYPE} -eq 0 ] && echo "#define EFTYPE EINVAL"
   [ ${HAVE_PATH_MAX} -eq 0 ] && echo "#define PATH_MAX 4096"
   
 cat << __HEREDOC__  cat << __HEREDOC__
 #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}  #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}
 #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}
Legend:
Removed from v.1.43.2.1  
changed lines
  Added in v.1.43.2.6
CVSweb