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

Diff for /mandoc/configure between version 1.43.2.7 and 1.43.2.13

version 1.43.2.7, 2016/10/20 19:34:18 version 1.43.2.13, 2017/03/04 16:44:43
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=
Line 47  LD_OHASH=
Line 49  LD_OHASH=
 LD_SQLITE3=  LD_SQLITE3=
 STATIC="-static"  STATIC="-static"
   
 BUILD_DB=1  
 BUILD_CGI=0  BUILD_CGI=0
   
 HAVE_DIRENT_NAMLEN=  HAVE_DIRENT_NAMLEN=
Line 85  HAVE_MANPATH=
Line 86  HAVE_MANPATH=
 PREFIX="/usr/local"  PREFIX="/usr/local"
 BINDIR=  BINDIR=
 SBINDIR=  SBINDIR=
   BIN_FROM_SBIN=
 INCLUDEDIR=  INCLUDEDIR=
 LIBDIR=  LIBDIR=
 MANDIR=  MANDIR=
Line 111  INSTALL_PROGRAM=
Line 113  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 147  ismanual() {
Line 150  ismanual() {
 singletest() {  singletest() {
         cat 1>&3 << __HEREDOC__          cat 1>&3 << __HEREDOC__
 ${1}${3}: 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
           then
                 echo "${1}${3}: ${CC} succeeded" 1>&3                  echo "${1}${3}: ${CC} succeeded" 1>&3
         else          else
                 echo "${1}${3}: ${CC} failed with $?" 1>&3                  echo "${1}${3}: ${CC} failed with $?" 1>&3
Line 245  else
Line 249  else
 fi  fi
   
 # --- sqlite3 ---  # --- sqlite3 ---
 if [ ${BUILD_DB} -eq 0 ]; then  if [ -n "${LD_SQLITE3}" ]; 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          runtest sqlite3 SQLITE3 "${LD_SQLITE3}" || true
 elif singletest sqlite3 SQLITE3 "-lsqlite3"; then  elif singletest sqlite3 SQLITE3 "-lsqlite3"; then
         LD_SQLITE3="-lsqlite3"          LD_SQLITE3="-lsqlite3"
Line 265  elif runtest sqlite3 SQLITE3 \
Line 260  elif runtest sqlite3 SQLITE3 \
         COMP="${COMP} -I/usr/local/include"          COMP="${COMP} -I/usr/local/include"
 fi  fi
 if [ ${HAVE_SQLITE3} -eq 0 ]; then  if [ ${HAVE_SQLITE3} -eq 0 ]; then
         LD_SQLITE3=          echo "FATAL: no sqlite3" 1>&2
         if [ ${BUILD_DB} -gt 0 ]; then          echo "FATAL: no sqlite3" 1>&3
                 echo "BUILD_DB=0 (no sqlite3)" 1>&2          echo "Use release 1.14.1 to build without SQLite." 1>&2
                 echo "BUILD_DB=0 (no sqlite3)" 1>&3          exit 1
                 echo 1>&3  
                 BUILD_DB=0  
         fi  
 fi  fi
   
 # --- sqlite3_errstr ---  # --- sqlite3_errstr ---
 if [ ${BUILD_DB} -eq 0 ]; then  if ismanual sqlite3_errstr SQLITE3_ERRSTR "${HAVE_SQLITE3_ERRSTR}"; then
         HAVE_SQLITE3_ERRSTR=1  
 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 391  cat << __HEREDOC__
Line 381  cat << __HEREDOC__
 #define HAVE_STRTONUM ${HAVE_STRTONUM}  #define HAVE_STRTONUM ${HAVE_STRTONUM}
 #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_SQLITE3_ERRSTR ${HAVE_SQLITE3_ERRSTR}
 #define HAVE_OHASH ${HAVE_OHASH}  #define HAVE_OHASH ${HAVE_OHASH}
 #define HAVE_MANPATH ${HAVE_MANPATH}  #define HAVE_MANPATH ${HAVE_MANPATH}
Line 431  fi
Line 420  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 ] &&  [ ${HAVE_SQLITE3_ERRSTR} -eq 0 ] &&
         echo "extern    const char *sqlite3_errstr(int);"          echo "extern    const char *sqlite3_errstr(int);"
   
 [ ${HAVE_STRCASESTR} -eq 0 ] && \  [ ${HAVE_STRCASESTR} -eq 0 ] && \
Line 459  echo "config.h: written" 1>&3
Line 448  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"
 [ -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="${BUILD_TARGETS} man.cgi"
         echo "BUILD_CGI=0 (no BUILD_DB)" 1>&3  INSTALL_TARGETS="base-install db-install"
         BUILD_CGI=0  
 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"  [ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-install"
   
 cat << __HEREDOC__  cat << __HEREDOC__
Line 496  STATIC  = ${STATIC}
Line 479  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 518  INSTALL_PROGRAM = ${INSTALL_PROGRAM}
Line 502  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.7  
changed lines
  Added in v.1.43.2.13
CVSweb