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

Diff for /mandoc/configure between version 1.13 and 1.21

version 1.13, 2014/08/17 20:53:50 version 1.21, 2015/03/11 13:15:44
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 #  #
 # Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>  # Copyright (c) 2014, 2015 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 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.
   
 VERSION="1.13.1"  
 echo "VERSION=\"${VERSION}\"" 1>&2  
 echo "VERSION=\"${VERSION}\"" 1>&3  
   
 OSNAME=  OSNAME=
   
 CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`  CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`
Line 56  HAVE_STRLCAT=
Line 52  HAVE_STRLCAT=
 HAVE_STRLCPY=  HAVE_STRLCPY=
 HAVE_STRPTIME=  HAVE_STRPTIME=
 HAVE_STRSEP=  HAVE_STRSEP=
   HAVE_STRTONUM=
 HAVE_WCHAR=  HAVE_WCHAR=
   
 HAVE_SQLITE3=  HAVE_SQLITE3=
Line 70  INCLUDEDIR=
Line 67  INCLUDEDIR=
 LIBDIR=  LIBDIR=
 MANDIR=  MANDIR=
 EXAMPLEDIR=  EXAMPLEDIR=
   HOMEBREWDIR=
   
 WWWPREFIX="/var/www"  WWWPREFIX="/var/www"
 HTDOCDIR=  HTDOCDIR=
 CGIBINDIR=  CGIBINDIR=
   
   BINM_APROPOS="apropos"
   BINM_MAN="man"
   BINM_WHATIS="whatis"
   BINM_MAKEWHATIS="makewhatis"
   MANM_MAN="man"
   MANM_MDOC="mdoc"
   MANM_ROFF="roff"
   MANM_EQN="eqn"
   MANM_TBL="tbl"
   
 INSTALL="install"  INSTALL="install"
 INSTALL_PROGRAM=  INSTALL_PROGRAM=
 INSTALL_LIB=  INSTALL_LIB=
Line 166  runtest strlcat  STRLCAT  || true
Line 174  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 wchar           WCHAR           || true  runtest wchar           WCHAR           || true
   
 # --- sqlite3 ---  # --- sqlite3 ---
Line 228  elif [ -z "${DBLIB}" ]; then
Line 237  elif [ -z "${DBLIB}" ]; then
 fi  fi
   
 # --- manpath ---  # --- manpath ---
 if [ ${BUILD_DB} -eq 0 ]; then  if ismanual manpath "${HAVE_MANPATH}"; then
         HAVE_MANPATH=0  
 elif ismanual manpath "${HAVE_MANPATH}"; then  
         :          :
 elif manpath 1>&3 2>&3; then  elif manpath 1>&3 2>&3; then
         echo "manpath: yes" 1>&2          echo "manpath: yes" 1>&2
Line 253  cat << __HEREDOC__
Line 260  cat << __HEREDOC__
 #define MANDOC_CONFIG_H  #define MANDOC_CONFIG_H
   
 #if defined(__linux__) || defined(__MINT__)  #if defined(__linux__) || defined(__MINT__)
 #define _GNU_SOURCE /* getsubopt(), strcasestr(), strptime() */  #define _GNU_SOURCE     /* See test-*.c what needs this. */
 #endif  #endif
   
 __HEREDOC__  __HEREDOC__
Line 264  __HEREDOC__
Line 271  __HEREDOC__
 [ ${HAVE_FGETLN} -eq 0 ] && echo "#include <stdio.h>"  [ ${HAVE_FGETLN} -eq 0 ] && echo "#include <stdio.h>"
   
 echo  echo
 echo "#define VERSION \"${VERSION}\""  
 [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""  [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
   [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""
   
 cat << __HEREDOC__  cat << __HEREDOC__
 #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}  #define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}
Line 279  cat << __HEREDOC__
Line 286  cat << __HEREDOC__
 #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_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}
 #define HAVE_OHASH ${HAVE_OHASH}  #define HAVE_OHASH ${HAVE_OHASH}
 #define HAVE_MANPATH ${HAVE_MANPATH}  #define HAVE_MANPATH ${HAVE_MANPATH}
   
   #define BINM_APROPOS "${BINM_APROPOS}"
   #define BINM_MAN "${BINM_MAN}"
   #define BINM_WHATIS "${BINM_WHATIS}"
   #define BINM_MAKEWHATIS "${BINM_MAKEWHATIS}"
   
 #if !defined(__BEGIN_DECLS)  #if !defined(__BEGIN_DECLS)
 #  ifdef __cplusplus  #  ifdef __cplusplus
 #  define       __BEGIN_DECLS           extern "C" {  #  define       __BEGIN_DECLS           extern "C" {
Line 326  __HEREDOC__
Line 339  __HEREDOC__
 [ ${HAVE_STRSEP} -eq 0 ] && \  [ ${HAVE_STRSEP} -eq 0 ] && \
         echo "extern    char     *strsep(char **, const char *);"          echo "extern    char     *strsep(char **, const char *);"
   
   [ ${HAVE_STRTONUM} -eq 0 ] && \
           echo "extern    long long strtonum(const char *, long long, long long, const char **);"
   
 echo  echo
 echo "#endif /* MANDOC_CONFIG_H */"  echo "#endif /* MANDOC_CONFIG_H */"
   
Line 358  if [ ${BUILD_DB} -eq 0 -a ${BUILD_CGI} -gt 0 ]; then
Line 374  if [ ${BUILD_DB} -eq 0 -a ${BUILD_CGI} -gt 0 ]; then
 fi  fi
   
 BUILD_TARGETS="base-build"  BUILD_TARGETS="base-build"
 [ ${BUILD_DB}  -gt 0 ] && BUILD_TARGETS="${BUILD_TARGETS} db-build"  
 [ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="${BUILD_TARGETS} cgi-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__
 VERSION         = ${VERSION}  
 BUILD_TARGETS   = ${BUILD_TARGETS}  BUILD_TARGETS   = ${BUILD_TARGETS}
   INSTALL_TARGETS = ${INSTALL_TARGETS}
 CFLAGS          = ${CFLAGS}  CFLAGS          = ${CFLAGS}
 DBLIB           = ${DBLIB}  DBLIB           = ${DBLIB}
 STATIC          = ${STATIC}  STATIC          = ${STATIC}
Line 377  EXAMPLEDIR = ${EXAMPLEDIR}
Line 395  EXAMPLEDIR = ${EXAMPLEDIR}
 WWWPREFIX       = ${WWWPREFIX}  WWWPREFIX       = ${WWWPREFIX}
 HTDOCDIR        = ${HTDOCDIR}  HTDOCDIR        = ${HTDOCDIR}
 CGIBINDIR       = ${CGIBINDIR}  CGIBINDIR       = ${CGIBINDIR}
   BINM_APROPOS    = ${BINM_APROPOS}
   BINM_MAN        = ${BINM_MAN}
   BINM_WHATIS     = ${BINM_WHATIS}
   BINM_MAKEWHATIS = ${BINM_MAKEWHATIS}
   MANM_MAN        = ${MANM_MAN}
   MANM_MDOC       = ${MANM_MDOC}
   MANM_ROFF       = ${MANM_ROFF}
   MANM_EQN        = ${MANM_EQN}
   MANM_TBL        = ${MANM_TBL}
 INSTALL         = ${INSTALL}  INSTALL         = ${INSTALL}
 INSTALL_PROGRAM = ${INSTALL_PROGRAM}  INSTALL_PROGRAM = ${INSTALL_PROGRAM}
 INSTALL_LIB     = ${INSTALL_LIB}  INSTALL_LIB     = ${INSTALL_LIB}
Line 385  INSTALL_DATA = ${INSTALL_DATA}
Line 412  INSTALL_DATA = ${INSTALL_DATA}
 __HEREDOC__  __HEREDOC__
   
 [ ${BUILD_DB} -gt 0 ] && \  [ ${BUILD_DB} -gt 0 ] && \
         echo "MAN_OBJS  = \$(MANDOC_OBJS) \$(APROPOS_OBJS)"          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.13  
changed lines
  Added in v.1.21
CVSweb