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

Diff for /mandoc/configure between version 1.31 and 1.34

version 1.31, 2015/11/06 21:19:09 version 1.34, 2015/11/07 17:58:55
Line 44  BUILD_CGI=0
Line 44  BUILD_CGI=0
   
 HAVE_DIRENT_NAMLEN=  HAVE_DIRENT_NAMLEN=
 HAVE_ERR=  HAVE_ERR=
 HAVE_FGETLN=  
 HAVE_FTS=  HAVE_FTS=
 HAVE_GETSUBOPT=  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
Line 76  SBINDIR=
Line 75  SBINDIR=
 INCLUDEDIR=  INCLUDEDIR=
 LIBDIR=  LIBDIR=
 MANDIR=  MANDIR=
 EXAMPLEDIR=  
 HOMEBREWDIR=  HOMEBREWDIR=
   
 WWWPREFIX="/var/www"  WWWPREFIX="/var/www"
Line 177  runtest() {
Line 175  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 getsubopt       GETSUBOPT       || true  runtest getsubopt       GETSUBOPT       || true
 runtest isblank         ISBLANK         || true  runtest isblank         ISBLANK         || true
Line 277  fi
Line 274  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 286  cat << __HEREDOC__
Line 287  cat << __HEREDOC__
   
 __HEREDOC__  __HEREDOC__
   
 [ ${HAVE_FGETLN} -eq 0 -o ${HAVE_REALLOCARRAY} -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>"  
   
 echo  echo
 echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""  echo "#define MAN_CONF_FILE \"/etc/${MANM_MANCONF}\""
Line 301  echo "#define MANPATH_DEFAULT \"${MANPATH_DEFAULT}\""
Line 301  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_GETSUBOPT ${HAVE_GETSUBOPT}  #define HAVE_GETSUBOPT ${HAVE_GETSUBOPT}
 #define HAVE_ISBLANK ${HAVE_ISBLANK}  #define HAVE_ISBLANK ${HAVE_ISBLANK}
Line 332  cat << __HEREDOC__
Line 331  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
Line 355  if [ ${HAVE_ERR} -eq 0 ]; then
Line 339  if [ ${HAVE_ERR} -eq 0 ]; then
         echo "extern    void      warnx(const char *, ...);"          echo "extern    void      warnx(const char *, ...);"
 fi  fi
   
 [ ${HAVE_FGETLN} -eq 0 ] && \  
         echo "extern    char     *fgetln(FILE *, size_t *);"  
   
 [ ${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 411  exec > Makefile.local
Line 392  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 446  SBINDIR  = ${SBINDIR}
Line 426  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.31  
changed lines
  Added in v.1.34
CVSweb