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

Diff for /mandoc/configure between version 1.21 and 1.36

version 1.21, 2015/03/11 13:15:44 version 1.36, 2015/11/07 21:31:22
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 31  echo "config.log: writing..."
Line 31  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.
   
   MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"
 OSNAME=  OSNAME=
   
 CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`  CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`
Line 42  BUILD_DB=1
Line 43  BUILD_DB=1
 BUILD_CGI=0  BUILD_CGI=0
   
 HAVE_DIRENT_NAMLEN=  HAVE_DIRENT_NAMLEN=
 HAVE_FGETLN=  HAVE_ERR=
 HAVE_FTS=  HAVE_FTS=
   HAVE_GETLINE=
 HAVE_GETSUBOPT=  HAVE_GETSUBOPT=
   HAVE_ISBLANK=
   HAVE_MKDTEMP=
 HAVE_MMAP=  HAVE_MMAP=
   HAVE_PLEDGE=
   HAVE_PROGNAME=
 HAVE_REALLOCARRAY=  HAVE_REALLOCARRAY=
   HAVE_REWB_BSD=
   HAVE_REWB_SYSV=
 HAVE_STRCASESTR=  HAVE_STRCASESTR=
   HAVE_STRINGLIST=
 HAVE_STRLCAT=  HAVE_STRLCAT=
 HAVE_STRLCPY=  HAVE_STRLCPY=
 HAVE_STRPTIME=  HAVE_STRPTIME=
 HAVE_STRSEP=  HAVE_STRSEP=
 HAVE_STRTONUM=  HAVE_STRTONUM=
   HAVE_VASPRINTF=
 HAVE_WCHAR=  HAVE_WCHAR=
   
 HAVE_SQLITE3=  HAVE_SQLITE3=
Line 66  SBINDIR=
Line 76  SBINDIR=
 INCLUDEDIR=  INCLUDEDIR=
 LIBDIR=  LIBDIR=
 MANDIR=  MANDIR=
 EXAMPLEDIR=  
 HOMEBREWDIR=  HOMEBREWDIR=
   
 WWWPREFIX="/var/www"  WWWPREFIX="/var/www"
Line 74  HTDOCDIR=
Line 83  HTDOCDIR=
 CGIBINDIR=  CGIBINDIR=
   
 BINM_APROPOS="apropos"  BINM_APROPOS="apropos"
   BINM_MAKEWHATIS="makewhatis"
 BINM_MAN="man"  BINM_MAN="man"
   BINM_SOELIM="soelim"
 BINM_WHATIS="whatis"  BINM_WHATIS="whatis"
 BINM_MAKEWHATIS="makewhatis"  
 MANM_MAN="man"  MANM_MAN="man"
   MANM_MANCONF="man.conf"
 MANM_MDOC="mdoc"  MANM_MDOC="mdoc"
 MANM_ROFF="roff"  MANM_ROFF="roff"
 MANM_EQN="eqn"  MANM_EQN="eqn"
Line 91  INSTALL_DATA=
Line 102  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 164  runtest() {
Line 175  runtest() {
   
 # --- library functions ---  # --- library functions ---
 runtest dirent-namlen   DIRENT_NAMLEN   || true  runtest dirent-namlen   DIRENT_NAMLEN   || true
 runtest fgetln          FGETLN          || true  runtest err             ERR             || 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 mkdtemp         MKDTEMP         || true
 runtest mmap            MMAP            || true  runtest mmap            MMAP            || true
   runtest pledge          PLEDGE          || 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 strlcat         STRLCAT         || true  runtest strlcat         STRLCAT         || true
 runtest strlcpy         STRLCPY         || true  runtest strlcpy         STRLCPY         || true
 runtest strptime        STRPTIME        || true  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 wchar           WCHAR           || true  runtest wchar           WCHAR           || true
   
 # --- sqlite3 ---  # --- sqlite3 ---
Line 228  fi
Line 248  fi
   
 # --- DBLIB ---  # --- DBLIB ---
 if [ ${BUILD_DB} -eq 0 ]; then  if [ ${BUILD_DB} -eq 0 ]; then
         DBLIB=          DBLIB="-lz"
 elif [ -z "${DBLIB}" ]; then  elif [ -z "${DBLIB}" ]; then
         DBLIB="${DETECTLIB}"          DBLIB="${DETECTLIB} -lz"
         echo "DBLIB=\"${DBLIB}\"" 1>&2          echo "DBLIB=\"${DBLIB}\"" 1>&2
         echo "DBLIB=\"${DBLIB}\"" 1>&3          echo "DBLIB=\"${DBLIB}\"" 1>&3
         echo 1>&3          echo 1>&3
Line 256  fi
Line 276  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 265  cat << __HEREDOC__
Line 289  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_FGETLN} -eq 0 ] && echo "#include <stdio.h>"  [ ${HAVE_VASPRINTF} -eq 0 ] && echo "#include <stdarg.h>"
   [ ${HAVE_GETLINE} -eq 0 ] && echo "#include <stdio.h>"
   
 echo  echo
   echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""
   echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
 [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""  [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
 [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""  [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""
   
 cat << __HEREDOC__  cat << __HEREDOC__
 #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}  #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}
 #define HAVE_FGETLN ${HAVE_FGETLN}  #define HAVE_ERR ${HAVE_ERR}
 #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_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_REALLOCARRAY ${HAVE_REALLOCARRAY}  #define HAVE_REALLOCARRAY ${HAVE_REALLOCARRAY}
   #define HAVE_REWB_BSD ${HAVE_REWB_BSD}
   #define HAVE_REWB_SYSV ${HAVE_REWB_SYSV}
 #define HAVE_STRCASESTR ${HAVE_STRCASESTR}  #define HAVE_STRCASESTR ${HAVE_STRCASESTR}
   #define HAVE_STRINGLIST ${HAVE_STRINGLIST}
 #define HAVE_STRLCAT ${HAVE_STRLCAT}  #define HAVE_STRLCAT ${HAVE_STRLCAT}
 #define HAVE_STRLCPY ${HAVE_STRLCPY}  #define HAVE_STRLCPY ${HAVE_STRLCPY}
 #define HAVE_STRPTIME ${HAVE_STRPTIME}  #define HAVE_STRPTIME ${HAVE_STRPTIME}
 #define HAVE_STRSEP ${HAVE_STRSEP}  #define HAVE_STRSEP ${HAVE_STRSEP}
 #define HAVE_STRTONUM ${HAVE_STRTONUM}  #define HAVE_STRTONUM ${HAVE_STRTONUM}
   #define HAVE_VASPRINTF ${HAVE_VASPRINTF}
 #define HAVE_WCHAR ${HAVE_WCHAR}  #define HAVE_WCHAR ${HAVE_WCHAR}
 #define HAVE_SQLITE3 ${HAVE_SQLITE3}  #define HAVE_SQLITE3 ${HAVE_SQLITE3}
 #define HAVE_SQLITE3_ERRSTR ${HAVE_SQLITE3_ERRSTR}  #define HAVE_SQLITE3_ERRSTR ${HAVE_SQLITE3_ERRSTR}
Line 294  cat << __HEREDOC__
Line 330  cat << __HEREDOC__
 #define HAVE_MANPATH ${HAVE_MANPATH}  #define HAVE_MANPATH ${HAVE_MANPATH}
   
 #define BINM_APROPOS "${BINM_APROPOS}"  #define BINM_APROPOS "${BINM_APROPOS}"
   #define BINM_MAKEWHATIS "${BINM_MAKEWHATIS}"
 #define BINM_MAN "${BINM_MAN}"  #define BINM_MAN "${BINM_MAN}"
   #define BINM_SOELIM "${BINM_SOELIM}"
 #define BINM_WHATIS "${BINM_WHATIS}"  #define BINM_WHATIS "${BINM_WHATIS}"
 #define BINM_MAKEWHATIS "${BINM_MAKEWHATIS}"  
   
 #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__
   
 [ ${HAVE_FGETLN} -eq 0 ] && \  if [ ${HAVE_ERR} -eq 0 ]; then
         echo "extern    char     *fgetln(FILE *, size_t *);"          echo "extern    void      err(int, const char *, ...);"
           echo "extern    void      warn(const char *, ...);"
           echo "extern    void      warnx(const char *, ...);"
   fi
   
   [ ${HAVE_GETLINE} -eq 0 ] && \
           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 **);"
   
   [ ${HAVE_ISBLANK} -eq 0 ] && \
           echo "extern    int       isblank(int);"
   
   [ ${HAVE_MKDTEMP} -eq 0 ] && \
           echo "extern    char     *mkdtemp(char *);"
   
   if [ ${HAVE_PROGNAME} -eq 0 ]; then
           echo "extern    const char *getprogname(void);"
           echo "extern    void      setprogname(const char *);"
   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);"
   
Line 342  __HEREDOC__
Line 381  __HEREDOC__
 [ ${HAVE_STRTONUM} -eq 0 ] && \  [ ${HAVE_STRTONUM} -eq 0 ] && \
         echo "extern    long long strtonum(const char *, long long, long long, const char **);"          echo "extern    long long strtonum(const char *, long long, long long, const char **);"
   
   [ ${HAVE_VASPRINTF} -eq 0 ] && \
           echo "extern    int       vasprintf(char **, const char *, va_list);"
   
 echo  echo
 echo "#endif /* MANDOC_CONFIG_H */"  echo "#endif /* MANDOC_CONFIG_H */"
   
Line 357  exec > Makefile.local
Line 399  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 382  INSTALL_TARGETS="base-install"
Line 423  INSTALL_TARGETS="base-install"
 cat << __HEREDOC__  cat << __HEREDOC__
 BUILD_TARGETS   = ${BUILD_TARGETS}  BUILD_TARGETS   = ${BUILD_TARGETS}
 INSTALL_TARGETS = ${INSTALL_TARGETS}  INSTALL_TARGETS = ${INSTALL_TARGETS}
   CC              = ${CC}
 CFLAGS          = ${CFLAGS}  CFLAGS          = ${CFLAGS}
 DBLIB           = ${DBLIB}  DBLIB           = ${DBLIB}
 STATIC          = ${STATIC}  STATIC          = ${STATIC}
Line 391  SBINDIR  = ${SBINDIR}
Line 433  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}
 BINM_APROPOS    = ${BINM_APROPOS}  BINM_APROPOS    = ${BINM_APROPOS}
   BINM_MAKEWHATIS = ${BINM_MAKEWHATIS}
 BINM_MAN        = ${BINM_MAN}  BINM_MAN        = ${BINM_MAN}
   BINM_SOELIM     = ${BINM_SOELIM}
 BINM_WHATIS     = ${BINM_WHATIS}  BINM_WHATIS     = ${BINM_WHATIS}
 BINM_MAKEWHATIS = ${BINM_MAKEWHATIS}  
 MANM_MAN        = ${MANM_MAN}  MANM_MAN        = ${MANM_MAN}
   MANM_MANCONF    = ${MANM_MANCONF}
 MANM_MDOC       = ${MANM_MDOC}  MANM_MDOC       = ${MANM_MDOC}
 MANM_ROFF       = ${MANM_ROFF}  MANM_ROFF       = ${MANM_ROFF}
 MANM_EQN        = ${MANM_EQN}  MANM_EQN        = ${MANM_EQN}

Legend:
Removed from v.1.21  
changed lines
  Added in v.1.36

CVSweb