=================================================================== RCS file: /cvs/mandoc/configure.local.example,v retrieving revision 1.14.2.9 retrieving revision 1.15 diff -u -p -r1.14.2.9 -r1.15 --- mandoc/configure.local.example 2017/03/04 16:44:43 1.14.2.9 +++ mandoc/configure.local.example 2016/07/19 21:31:55 1.15 @@ -1,6 +1,6 @@ -# $Id: configure.local.example,v 1.14.2.9 2017/03/04 16:44:43 schwarze Exp $ +# $Id: configure.local.example,v 1.15 2016/07/19 21:31:55 schwarze Exp $ # -# Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze +# Copyright (c) 2014, 2015, 2016 Ingo Schwarze # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -48,13 +48,6 @@ HAVE_WCHAR=1 HAVE_WCHAR=0 -# For -Tutf8 mode, mandoc needs to set an arbitrary locale having -# a UTF-8 character set. If autodetection of a suitable locale -# fails or selects an undesirable locale, you can manually choose -# the locale for -Tutf8 mode: - -UTF8_LOCALE=en_US.UTF-8 - # When man(1) or apropos(1) is called without -m and -M options, # MANPATH is not set in the environment, man.conf(5) is not available # and manpath(1) not used, manuals are searched for in the following @@ -87,13 +80,6 @@ INCLUDEDIR="${PREFIX}/include/mandoc" LIBDIR="${PREFIX}/lib/mandoc" MANDIR="${PREFIX}/man" -# If BINDIR and SBINDIR are not subdirectories of the same parent -# directory or if the basename(1) of BINDIR differs from "bin", -# the relative path from SBINDIR to BINDIR is also needed. -# The default is: - -BIN_FROM_SBIN="../bin" - # The man(1) utility needs to know where the manuals reside. # We know of two ways to tell it: via manpath(1) or man.conf(5). # The latter is used by OpenBSD and NetBSD, the former by most @@ -125,25 +111,22 @@ MANM_ROFF="mandoc_roff" # default is "roff" MANM_EQN="mandoc_eqn" # default is "eqn" MANM_TBL="mandoc_tbl" # default is "tbl" -# Some distributions may want to avoid naming conflicts -# with other man(1) and soelim(1) utilities. +# Some distributions may want to avoid naming conflicts with +# other man(1), apropos(1), makewhatis(8), or soelim(1) utilities. # If you want to change the names of binary programs, # the following alternative names are suggested. # Using different names is possible as well. -# This changes the names of the installed section 1 manual pages as well. +# This changes the names of the installed section 1 and section 8 +# manual pages as well. +# It is possible to set only one or two of these variables, +# there is no need to copy the whole block. BINM_MAN=mman # default is "man" +BINM_APROPOS=mapropos # default is "apropos" +BINM_WHATIS=mwhatis # default is "whatis" +BINM_MAKEWHATIS=mandocdb # default is "makewhatis" BINM_SOELIM=msoelim # default is "soelim" -# Some distributions do not want hardlinks -# between installed binary programs. -# Set the following variable to use symbolic links instead. -# It is also used for links between manual pages. -# It is only used by the install* targets. -# When using this, DESTDIR must be empty or an absolute path. - -LN="ln -sf" # default is "ln -f" - # Before falling back to the bundled version of the ohash(3) hashing # library, autoconfiguration tries the following linker flag to # link against your system version. If you do have ohash(3) on @@ -152,17 +135,18 @@ LN="ln -sf" # default is "ln -f" LD_OHASH="-lutil" -# Some platforms may need an additional linker flag for nanosleep(2). -# If none is needed or it is -lrt, it is autodetected. -# Otherwise, set the following variable. +# When library autodetection decides to use -L/usr/local/lib, +# -I/usr/local/include is automatically added to CFLAGS. +# If you manually set LD_OHASH to something including -L/usr/local/lib, +# chances are you will also need the following line: -LD_NANOSLEEP="-lrt" +CFLAGS="${CFLAGS} -I/usr/local/include" -# Some platforms might need additional linker flags to link against -# libmandoc that are not autodetected, though no such cases are -# currently known. +# Some platforms may need additional linker flags to link against libmandoc +# that are not autodetected. +# For example, Solaris 9 and 10 need -lrt for nanosleep(2). -LDADD="-lm" +LDADD="-lrt" # Some systems may want to set additional linker flags for all the # binaries, not only for those using libmandoc, for example for @@ -179,36 +163,6 @@ INSTALL_LIB="${INSTALL} -m 0444" INSTALL_MAN="${INSTALL} -m 0444" INSTALL_DATA="${INSTALL} -m 0444" -# --- user settings related to database support ------------------------ - -# Autoconfiguration tries the following linker flags to find the -# SQLite3 library installed on your system. If none of these work, -# set the following variable to specify the required linker flags. - -LD_SQLITE3="-lsqlite3" -LD_SQLITE3="-L/usr/local/lib -lsqlite3" - -# When library autodetection decides to use -L/usr/local/lib, -# -I/usr/local/include is automatically added to CFLAGS. -# If you manually set LD_SQLITE3 to something including -L/usr/local/lib, -# chances are you will also need the following line: - -CFLAGS="${CFLAGS} -I/usr/local/include" - -# Some distributions may want to avoid naming conflicts -# with another implementation of apropos(1) and makewhatis(8). -# If you want to change the names of the binary programs, -# the following alternative names are suggested. -# Using other names is possible as well. -# This changes the names of the installed section 1 and section 8 -# manual pages as well. -# It is possible to set only one or two of these variables, -# there is no need to copy the whole block. - -BINM_APROPOS=mapropos # default is "apropos" -BINM_WHATIS=mwhatis # default is "whatis" -BINM_MAKEWHATIS=mandocdb # default is "makewhatis" - # When using the "homebrew" package manager on Mac OS X, the actual # manuals are located in a so-called "cellar" and only symlinked # into the manual trees. To allow mandoc to follow such symlinks, @@ -273,16 +227,13 @@ CFLAGS="-g" # be regarded as successful). HAVE_DIRENT_NAMLEN=0 -HAVE_EFTYPE=0 HAVE_ERR=0 -HAVE_FTS=0 # Setting this implies HAVE_FTS_COMPARE_CONST=0. -HAVE_FTS_COMPARE_CONST=0 # Setting this implies HAVE_FTS=1. +HAVE_FTS=0 HAVE_GETLINE=0 HAVE_GETSUBOPT=0 HAVE_ISBLANK=0 HAVE_MKDTEMP=0 -HAVE_MMAP=0 -HAVE_PATH_MAX=0 +HAVE_OHASH=0 HAVE_PLEDGE=0 HAVE_PROGNAME=0 HAVE_REALLOCARRAY=0 @@ -297,6 +248,3 @@ HAVE_STRSEP=0 HAVE_STRTONUM=0 HAVE_VASPRINTF=0 HAVE_WCHAR=0 - -HAVE_SQLITE3_ERRSTR=0 -HAVE_OHASH=0