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

Diff for /mandoc/configure between version 1.37 and 1.38

version 1.37, 2015/11/26 07:42:11 version 1.38, 2016/05/18 21:37:04
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 #  #
 # Copyright (c) 2014, 2015 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 36  OSNAME=
Line 36  OSNAME=
   
 CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`  CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`
 CFLAGS="-g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings"  CFLAGS="-g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings"
 DBLIB=  LDADD=
   LD_OHASH=
   LD_SQLITE3=
 STATIC="-static"  STATIC="-static"
   
 BUILD_DB=1  BUILD_DB=1
Line 198  runtest vasprintf VASPRINTF || true
Line 200  runtest vasprintf VASPRINTF || true
 runtest wchar           WCHAR           || true  runtest wchar           WCHAR           || true
   
 # --- sqlite3 ---  # --- sqlite3 ---
 DETECTLIB=  
 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 "${HAVE_SQLITE3}"; then
         DETECTLIB="-lsqlite3"          if [ -z "${LD_SQLITE3}" ]; then
 elif [ -n "${DBLIB}" ]; then                  LD_SQLITE3="-lsqlite3"
         runtest sqlite3 SQLITE3 "${DBLIB}" || true          fi
   elif [ -n "${LD_SQLITE3}" ]; then
           runtest sqlite3 SQLITE3 "${LD_SQLITE3}" || true
 elif singletest sqlite3 SQLITE3 "-lsqlite3"; then  elif singletest sqlite3 SQLITE3 "-lsqlite3"; then
         DETECTLIB="-lsqlite3"          LD_SQLITE3="-lsqlite3"
 elif runtest sqlite3 SQLITE3 \  elif runtest sqlite3 SQLITE3 \
                 "-I/usr/local/include -L/usr/local/lib -lsqlite3"; then                  "-I/usr/local/include -L/usr/local/lib -lsqlite3"; then
         DETECTLIB="-L/usr/local/lib -lsqlite3"          LD_SQLITE3="-L/usr/local/lib -lsqlite3"
         CFLAGS="${CFLAGS} -I/usr/local/include"          CFLAGS="${CFLAGS} -I/usr/local/include"
 fi  fi
 if [ ${BUILD_DB} -gt 0 -a ${HAVE_SQLITE3} -eq 0 ]; then  if [ ${HAVE_SQLITE3} -eq 0 ]; then
         echo "BUILD_DB=0 (no sqlite3)" 1>&2          LD_SQLITE3=
         echo "BUILD_DB=0 (no sqlite3)" 1>&3          if [ ${BUILD_DB} -gt 0 ]; then
         echo 1>&3                  echo "BUILD_DB=0 (no sqlite3)" 1>&2
         BUILD_DB=0                  echo "BUILD_DB=0 (no sqlite3)" 1>&3
                   echo 1>&3
                   BUILD_DB=0
           fi
 fi  fi
   
 # --- sqlite3_errstr ---  # --- sqlite3_errstr ---
Line 227  if [ ${BUILD_DB} -eq 0 ]; then
Line 233  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 "${HAVE_SQLITE3_ERRSTR}"; then
         :          :
 elif [ -n "${DBLIB}" ]; then  
         runtest sqlite3_errstr SQLITE3_ERRSTR "${DBLIB}" || true  
 else  else
         runtest sqlite3_errstr SQLITE3_ERRSTR "${DETECTLIB}" || true          runtest sqlite3_errstr SQLITE3_ERRSTR "${LD_SQLITE3}" || true
 fi  fi
   
 # --- ohash ---  # --- ohash ---
 if [ ${BUILD_DB} -eq 0 ]; then  if ismanual ohash "${HAVE_OHASH}"; then
         HAVE_OHASH=1  
 elif ismanual ohash "${HAVE_OHASH}"; then  
         :          :
 elif [ -n "${DBLIB}" ]; then  elif [ -n "${LD_OHASH}" ]; then
         runtest ohash OHASH "${DBLIB}" || true          runtest ohash OHASH "${LD_OHASH}" || true
 elif singletest ohash OHASH; then  elif singletest ohash OHASH; then
         :          :
 elif runtest ohash OHASH "-lutil"; then  elif runtest ohash OHASH "-lutil"; then
         DETECTLIB="${DETECTLIB} -lutil"          LD_OHASH="-lutil"
 fi  fi
   if [ "${HAVE_OHASH}" -eq 0 ]; then
 # --- DBLIB ---          LD_OHASH=
 if [ ${BUILD_DB} -eq 0 ]; then  
         DBLIB="-lz"  
 elif [ -z "${DBLIB}" ]; then  
         DBLIB="${DETECTLIB} -lz"  
         echo "DBLIB=\"${DBLIB}\"" 1>&2  
         echo "DBLIB=\"${DBLIB}\"" 1>&3  
         echo 1>&3  
 fi  fi
   
   # --- LDADD ---
   LDADD="${LDADD} ${LD_SQLITE3} ${LD_OHASH} -lz"
   echo "LDADD=\"${LDADD}\"" 1>&2
   echo "LDADD=\"${LDADD}\"" 1>&3
   echo 1>&3
   
 # --- manpath ---  # --- manpath ---
 if ismanual manpath "${HAVE_MANPATH}"; then  if ismanual manpath "${HAVE_MANPATH}"; then
         :          :
Line 426  BUILD_TARGETS = ${BUILD_TARGETS}
Line 427  BUILD_TARGETS = ${BUILD_TARGETS}
 INSTALL_TARGETS = ${INSTALL_TARGETS}  INSTALL_TARGETS = ${INSTALL_TARGETS}
 CC              = ${CC}  CC              = ${CC}
 CFLAGS          = ${CFLAGS}  CFLAGS          = ${CFLAGS}
 DBLIB           = ${DBLIB}  LDADD           = ${LDADD}
 STATIC          = ${STATIC}  STATIC          = ${STATIC}
 PREFIX          = ${PREFIX}  PREFIX          = ${PREFIX}
 BINDIR          = ${BINDIR}  BINDIR          = ${BINDIR}
Legend:
Removed from v.1.37  
changed lines
  Added in v.1.38
CVSweb