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

Diff for /mandoc/configure between version 1.43 and 1.44

version 1.43, 2016/07/19 13:36:13 version 1.44, 2016/07/19 21:31:55
Line 40  CFLAGS="${CFLAGS} -Wno-unused-parameter"
Line 40  CFLAGS="${CFLAGS} -Wno-unused-parameter"
 LDADD=  LDADD=
 LDFLAGS=  LDFLAGS=
 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=
Line 53  HAVE_GETLINE=
Line 51  HAVE_GETLINE=
 HAVE_GETSUBOPT=  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
 HAVE_MKDTEMP=  HAVE_MKDTEMP=
 HAVE_MMAP=  
 HAVE_PLEDGE=  HAVE_PLEDGE=
 HAVE_PROGNAME=  HAVE_PROGNAME=
 HAVE_REALLOCARRAY=  HAVE_REALLOCARRAY=
Line 70  HAVE_STRTONUM=
Line 67  HAVE_STRTONUM=
 HAVE_VASPRINTF=  HAVE_VASPRINTF=
 HAVE_WCHAR=  HAVE_WCHAR=
   
 HAVE_SQLITE3=  
 HAVE_SQLITE3_ERRSTR=  
 HAVE_OHASH=  HAVE_OHASH=
 HAVE_MANPATH=  HAVE_MANPATH=
   
Line 186  runtest getline  GETLINE  || true
Line 181  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 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 203  runtest strtonum STRTONUM || true
Line 197  runtest strtonum STRTONUM || true
 runtest vasprintf       VASPRINTF       || true  runtest vasprintf       VASPRINTF       || true
 runtest wchar           WCHAR           || true  runtest wchar           WCHAR           || true
   
 # --- 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 "${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"  
 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 "${HAVE_SQLITE3_ERRSTR}"; then  
         :  
 else  
         runtest sqlite3_errstr SQLITE3_ERRSTR "${LD_SQLITE3}" || true  
 fi  
   
 # --- ohash ---  # --- ohash ---
 if ismanual ohash "${HAVE_OHASH}"; then  if ismanual ohash "${HAVE_OHASH}"; then
         :          :
Line 256  if [ "${HAVE_OHASH}" -eq 0 ]; then
Line 212  if [ "${HAVE_OHASH}" -eq 0 ]; then
 fi  fi
   
 # --- LDADD ---  # --- LDADD ---
 LDADD="${LDADD} ${LD_SQLITE3} ${LD_OHASH} -lz"  LDADD="${LDADD} ${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
Line 315  cat << __HEREDOC__
Line 271  cat << __HEREDOC__
 #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_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 331  cat << __HEREDOC__
Line 286  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_OHASH ${HAVE_OHASH}  #define HAVE_OHASH ${HAVE_OHASH}
 #define HAVE_MANPATH ${HAVE_MANPATH}  #define HAVE_MANPATH ${HAVE_MANPATH}
   
Line 371  fi
Line 324  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 413  exec > Makefile.local
Line 363  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 459  INSTALL_LIB = ${INSTALL_LIB}
Line 402  INSTALL_LIB = ${INSTALL_LIB}
 INSTALL_MAN     = ${INSTALL_MAN}  INSTALL_MAN     = ${INSTALL_MAN}
 INSTALL_DATA    = ${INSTALL_DATA}  INSTALL_DATA    = ${INSTALL_DATA}
 __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  
changed lines
  Added in v.1.44
CVSweb