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

Diff for /mandoc/configure between version 1.29 and 1.40

version 1.29, 2015/11/06 16:30:33 version 1.40, 2016/07/12 05:18:38
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 16 
Line 16 
   
 set -e  set -e
   
 [ -e config.log ] && mv config.log config.log.old  [ -w config.log ] && mv config.log config.log.old
 [ -e config.h   ] && mv config.h config.h.old  [ -w config.h   ] && mv config.h config.h.old
   
 # Output file descriptor usage:  # Output file descriptor usage:
 # 1 (stdout): config.h, Makefile.local  # 1 (stdout): config.h, Makefile.local
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=
   LDFLAGS=
   LD_OHASH=
   LD_SQLITE3=
 STATIC="-static"  STATIC="-static"
   
 BUILD_DB=1  BUILD_DB=1
Line 44  BUILD_CGI=0
Line 47  BUILD_CGI=0
   
 HAVE_DIRENT_NAMLEN=  HAVE_DIRENT_NAMLEN=
 HAVE_ERR=  HAVE_ERR=
 HAVE_FGETLN=  
 HAVE_FTS=  HAVE_FTS=
   HAVE_GETLINE=
 HAVE_GETSUBOPT=  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
 HAVE_MKDTEMP=  HAVE_MKDTEMP=
 HAVE_MMAP=  HAVE_MMAP=
   HAVE_PLEDGE=
 HAVE_PROGNAME=  HAVE_PROGNAME=
 HAVE_REALLOCARRAY=  HAVE_REALLOCARRAY=
   HAVE_REWB_BSD=
   HAVE_REWB_SYSV=
   HAVE_SANDBOX_INIT=
 HAVE_STRCASESTR=  HAVE_STRCASESTR=
 HAVE_STRINGLIST=  HAVE_STRINGLIST=
 HAVE_STRLCAT=  HAVE_STRLCAT=
Line 73  SBINDIR=
Line 80  SBINDIR=
 INCLUDEDIR=  INCLUDEDIR=
 LIBDIR=  LIBDIR=
 MANDIR=  MANDIR=
 EXAMPLEDIR=  
 HOMEBREWDIR=  HOMEBREWDIR=
   
 WWWPREFIX="/var/www"  WWWPREFIX="/var/www"
Line 100  INSTALL_DATA=
Line 106  INSTALL_DATA=
   
 # --- manual settings from configure.local -----------------------------  # --- manual settings from configure.local -----------------------------
   
 if [ -e ./configure.local ]; then  if [ -r ./configure.local ]; then
         echo "configure.local: reading..." 1>&2          echo "configure.local: reading..." 1>&2
         echo "configure.local: reading..." 1>&3          echo "configure.local: reading..." 1>&3
         cat ./configure.local 1>&3          cat ./configure.local 1>&3
Line 174  runtest() {
Line 180  runtest() {
 # --- library functions ---  # --- library functions ---
 runtest dirent-namlen   DIRENT_NAMLEN   || true  runtest dirent-namlen   DIRENT_NAMLEN   || true
 runtest err             ERR             || true  runtest err             ERR             || true
 runtest fgetln          FGETLN          || true  
 runtest fts             FTS             || true  runtest fts             FTS             || 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 pledge          PLEDGE          || true
   runtest sandbox_init    SANDBOX_INIT    || true
 runtest progname        PROGNAME        || true  runtest progname        PROGNAME        || true
 runtest reallocarray    REALLOCARRAY    || true  runtest reallocarray    REALLOCARRAY    || true
   runtest rewb-bsd        REWB_BSD        || 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
Line 193  runtest vasprintf VASPRINTF || true
Line 203  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 222  if [ ${BUILD_DB} -eq 0 ]; then
Line 236  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 271  fi
Line 280  fi
 exec > config.h  exec > config.h
   
 cat << __HEREDOC__  cat << __HEREDOC__
   #ifdef __cplusplus
   #error "Do not use C++.  See the INSTALL file."
   #endif
   
 #ifndef MANDOC_CONFIG_H  #ifndef MANDOC_CONFIG_H
 #define MANDOC_CONFIG_H  #define MANDOC_CONFIG_H
   
Line 280  cat << __HEREDOC__
Line 293  cat << __HEREDOC__
   
 __HEREDOC__  __HEREDOC__
   
 [ ${HAVE_FGETLN} -eq 0 -o ${HAVE_REALLOCARRAY} -eq 0 -o \  [ ${HAVE_GETLINE} -eq 0 -o ${HAVE_REALLOCARRAY} -eq 0 -o \
   ${HAVE_STRLCAT} -eq 0 -o ${HAVE_STRLCPY} -eq 0 ] \    ${HAVE_STRLCAT} -eq 0 -o ${HAVE_STRLCPY} -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_FGETLN} -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}\""
Line 295  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
Line 308  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
 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_FGETLN ${HAVE_FGETLN}  
 #define HAVE_FTS ${HAVE_FTS}  #define HAVE_FTS ${HAVE_FTS}
   #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_MMAP ${HAVE_MMAP}
   #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_REWB_BSD ${HAVE_REWB_BSD}
   #define HAVE_REWB_SYSV ${HAVE_REWB_SYSV}
   #define HAVE_SANDBOX_INIT ${HAVE_SANDBOX_INIT}
 #define HAVE_STRCASESTR ${HAVE_STRCASESTR}  #define HAVE_STRCASESTR ${HAVE_STRCASESTR}
 #define HAVE_STRINGLIST ${HAVE_STRINGLIST}  #define HAVE_STRINGLIST ${HAVE_STRINGLIST}
 #define HAVE_STRLCAT ${HAVE_STRLCAT}  #define HAVE_STRLCAT ${HAVE_STRLCAT}
Line 323  cat << __HEREDOC__
Line 340  cat << __HEREDOC__
 #define BINM_SOELIM "${BINM_SOELIM}"  #define BINM_SOELIM "${BINM_SOELIM}"
 #define BINM_WHATIS "${BINM_WHATIS}"  #define BINM_WHATIS "${BINM_WHATIS}"
   
 #if !defined(__BEGIN_DECLS)  
 #  ifdef __cplusplus  
 #  define       __BEGIN_DECLS           extern "C" {  
 #  else  
 #  define       __BEGIN_DECLS  
 #  endif  
 #endif  
 #if !defined(__END_DECLS)  
 #  ifdef __cplusplus  
 #  define       __END_DECLS             }  
 #  else  
 #  define       __END_DECLS  
 #  endif  
 #endif  
   
 __HEREDOC__  __HEREDOC__
   
 if [ ${HAVE_ERR} -eq 0 ]; then  if [ ${HAVE_ERR} -eq 0 ]; then
         echo "extern    void      err(int, const char *, ...);"          echo "extern    void      err(int, const char *, ...);"
           echo "extern    void      errx(int, const char *, ...);"
         echo "extern    void      warn(const char *, ...);"          echo "extern    void      warn(const char *, ...);"
         echo "extern    void      warnx(const char *, ...);"          echo "extern    void      warnx(const char *, ...);"
 fi  fi
   
 [ ${HAVE_FGETLN} -eq 0 ] && \  [ ${HAVE_GETLINE} -eq 0 ] && \
         echo "extern    char     *fgetln(FILE *, size_t *);"          echo "extern    ssize_t   getline(char **, size_t *, FILE *);"
   
 [ ${HAVE_GETSUBOPT} -eq 0 ] && \  [ ${HAVE_GETSUBOPT} -eq 0 ] && \
         echo "extern    int       getsubopt(char **, char * const *, char **);"          echo "extern    int       getsubopt(char **, char * const *, char **);"
Line 402  exec > Makefile.local
Line 405  exec > Makefile.local
 [ -z "${INCLUDEDIR}" ] && INCLUDEDIR="${PREFIX}/include/mandoc"  [ -z "${INCLUDEDIR}" ] && INCLUDEDIR="${PREFIX}/include/mandoc"
 [ -z "${LIBDIR}"     ] && LIBDIR="${PREFIX}/lib/mandoc"  [ -z "${LIBDIR}"     ] && LIBDIR="${PREFIX}/lib/mandoc"
 [ -z "${MANDIR}"     ] && MANDIR="${PREFIX}/man"  [ -z "${MANDIR}"     ] && MANDIR="${PREFIX}/man"
 [ -z "${EXAMPLEDIR}" ] && EXAMPLEDIR="${PREFIX}/share/examples/mandoc"  
   
 [ -z "${HTDOCDIR}"   ] && HTDOCDIR="${WWWPREFIX}/htdocs"  [ -z "${HTDOCDIR}"   ] && HTDOCDIR="${WWWPREFIX}/htdocs"
 [ -z "${CGIBINDIR}"  ] && CGIBINDIR="${WWWPREFIX}/cgi-bin"  [ -z "${CGIBINDIR}"  ] && CGIBINDIR="${WWWPREFIX}/cgi-bin"
Line 429  BUILD_TARGETS = ${BUILD_TARGETS}
Line 431  BUILD_TARGETS = ${BUILD_TARGETS}
 INSTALL_TARGETS = ${INSTALL_TARGETS}  INSTALL_TARGETS = ${INSTALL_TARGETS}
 CC              = ${CC}  CC              = ${CC}
 CFLAGS          = ${CFLAGS}  CFLAGS          = ${CFLAGS}
 DBLIB           = ${DBLIB}  LDADD           = ${LDADD}
   LDFLAGS         = ${LDFLAGS}
 STATIC          = ${STATIC}  STATIC          = ${STATIC}
 PREFIX          = ${PREFIX}  PREFIX          = ${PREFIX}
 BINDIR          = ${BINDIR}  BINDIR          = ${BINDIR}
Line 437  SBINDIR  = ${SBINDIR}
Line 440  SBINDIR  = ${SBINDIR}
 INCLUDEDIR      = ${INCLUDEDIR}  INCLUDEDIR      = ${INCLUDEDIR}
 LIBDIR          = ${LIBDIR}  LIBDIR          = ${LIBDIR}
 MANDIR          = ${MANDIR}  MANDIR          = ${MANDIR}
 EXAMPLEDIR      = ${EXAMPLEDIR}  
 WWWPREFIX       = ${WWWPREFIX}  WWWPREFIX       = ${WWWPREFIX}
 HTDOCDIR        = ${HTDOCDIR}  HTDOCDIR        = ${HTDOCDIR}
 CGIBINDIR       = ${CGIBINDIR}  CGIBINDIR       = ${CGIBINDIR}
Legend:
Removed from v.1.29  
changed lines
  Added in v.1.40
CVSweb