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

Diff for /mandoc/configure between version 1.39 and 1.43.2.1

version 1.39, 2016/07/10 18:24:23 version 1.43.2.1, 2016/07/20 14:14:07
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 #  #
   # $Id$
   #
 # Copyright (c) 2014, 2015, 2016 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
Line 34  echo "config.log: writing..."
Line 36  echo "config.log: writing..."
 MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"  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" | env -i make -f -`
 CFLAGS="-g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings"  CFLAGS="-g -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings"
   CFLAGS="${CFLAGS} -Wno-unused-parameter"
 LDADD=  LDADD=
 LDFLAGS=  LDFLAGS=
   LD_NANOSLEEP=
 LD_OHASH=  LD_OHASH=
 LD_SQLITE3=  LD_SQLITE3=
 STATIC="-static"  STATIC="-static"
Line 53  HAVE_GETSUBOPT=
Line 57  HAVE_GETSUBOPT=
 HAVE_ISBLANK=  HAVE_ISBLANK=
 HAVE_MKDTEMP=  HAVE_MKDTEMP=
 HAVE_MMAP=  HAVE_MMAP=
   HAVE_NANOSLEEP=
 HAVE_PLEDGE=  HAVE_PLEDGE=
 HAVE_PROGNAME=  HAVE_PROGNAME=
 HAVE_REALLOCARRAY=  HAVE_REALLOCARRAY=
 HAVE_REWB_BSD=  HAVE_REWB_BSD=
 HAVE_REWB_SYSV=  HAVE_REWB_SYSV=
   HAVE_SANDBOX_INIT=
 HAVE_STRCASESTR=  HAVE_STRCASESTR=
 HAVE_STRINGLIST=  HAVE_STRINGLIST=
 HAVE_STRLCAT=  HAVE_STRLCAT=
Line 186  runtest isblank  ISBLANK  || true
Line 192  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 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-bsd        REWB_BSD        || true
Line 238  else
Line 245  else
         runtest sqlite3_errstr SQLITE3_ERRSTR "${LD_SQLITE3}" || true          runtest sqlite3_errstr SQLITE3_ERRSTR "${LD_SQLITE3}" || true
 fi  fi
   
   # --- nanosleep ---
   if [ -n "${LD_NANOSLEEP}" ]; then
           runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" || true
   elif singletest nanosleep NANOSLEEP; then
           :
   elif runtest nanosleep NANOSLEEP "-lrt"; then
           LD_NANOSLEEP="-lrt"
   fi
   if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
           echo "FATAL: nanosleep: no" 1>&2
           echo "FATAL: nanosleep: no" 1>&3
           exit 1
   fi
   
 # --- ohash ---  # --- ohash ---
 if ismanual ohash "${HAVE_OHASH}"; then  if ismanual ohash "${HAVE_OHASH}"; then
         :          :
Line 253  if [ "${HAVE_OHASH}" -eq 0 ]; then
Line 274  if [ "${HAVE_OHASH}" -eq 0 ]; then
 fi  fi
   
 # --- LDADD ---  # --- LDADD ---
 LDADD="${LDADD} ${LD_SQLITE3} ${LD_OHASH} -lz"  LDADD="${LDADD} ${LD_SQLITE3} ${LD_NANOSLEEP} ${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 282  cat << __HEREDOC__
Line 303  cat << __HEREDOC__
 #error "Do not use C++.  See the INSTALL file."  #error "Do not use C++.  See the INSTALL file."
 #endif  #endif
   
 #ifndef MANDOC_CONFIG_H  #if !defined(__GNUC__) || (__GNUC__ < 4)
 #define MANDOC_CONFIG_H  #define __attribute__(x)
   #endif
   
 #if defined(__linux__) || defined(__MINT__)  #if defined(__linux__) || defined(__MINT__)
 #define _GNU_SOURCE     /* See test-*.c what needs this. */  #define _GNU_SOURCE     /* See test-*.c what needs this. */
Line 317  cat << __HEREDOC__
Line 339  cat << __HEREDOC__
 #define HAVE_REALLOCARRAY ${HAVE_REALLOCARRAY}  #define HAVE_REALLOCARRAY ${HAVE_REALLOCARRAY}
 #define HAVE_REWB_BSD ${HAVE_REWB_BSD}  #define HAVE_REWB_BSD ${HAVE_REWB_BSD}
 #define HAVE_REWB_SYSV ${HAVE_REWB_SYSV}  #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 386  fi
Line 409  fi
   
 [ ${HAVE_VASPRINTF} -eq 0 ] && \  [ ${HAVE_VASPRINTF} -eq 0 ] && \
         echo "extern    int       vasprintf(char **, const char *, va_list);"          echo "extern    int       vasprintf(char **, const char *, va_list);"
   
 echo  
 echo "#endif /* MANDOC_CONFIG_H */"  
   
 echo "config.h: written" 1>&2  echo "config.h: written" 1>&2
 echo "config.h: written" 1>&3  echo "config.h: written" 1>&3
Legend:
Removed from v.1.39  
changed lines
  Added in v.1.43.2.1
CVSweb