=================================================================== RCS file: /cvs/mandoc/configure.local.example,v retrieving revision 1.10 retrieving revision 1.15 diff -u -p -r1.10 -r1.15 --- mandoc/configure.local.example 2015/11/07 13:14:21 1.10 +++ mandoc/configure.local.example 2016/07/19 21:31:55 1.15 @@ -1,6 +1,6 @@ -# $Id: configure.local.example,v 1.10 2015/11/07 13:14:21 schwarze Exp $ +# $Id: configure.local.example,v 1.15 2016/07/19 21:31:55 schwarze Exp $ # -# Copyright (c) 2014, 2015 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 @@ -65,7 +65,7 @@ MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/lo # If you do not want uname(3) to be called but instead want a fixed # string to be used, use the following line: -OSNAME="OpenBSD 5.6" +OSNAME="OpenBSD 6.0" # The following installation directories are used. # It is possible to set only one or a few of these variables, @@ -91,8 +91,6 @@ MANDIR="${PREFIX}/man" HAVE_MANPATH=1 # Force usage of man.conf(5). -# If it does not exist or contains no valid configuration, -# man(1), makewhatis(8), and apropos(1) will not work properly. HAVE_MANPATH=0 # Some distributions may want to avoid naming conflicts @@ -113,64 +111,58 @@ 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" -# It is possible to change the utility program used for installation -# and the modes files are installed with. The defaults are: +# 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 +# your system but it needs different linker flags, set the following +# variable to specify the required linker flags. -INSTALL="install" -INSTALL_PROGRAM="${INSTALL} -m 0555" -INSTALL_LIB="${INSTALL} -m 0444" -INSTALL_MAN="${INSTALL} -m 0444" -INSTALL_DATA="${INSTALL} -m 0444" +LD_OHASH="-lutil" -# --- user settings related to database support ------------------------ - -# By default, building makewhatis(8) and apropos(1) is enabled. -# To disable it, for example to avoid the dependency on SQLite3, -# use the following line. It that case, the remaining settings -# in this section are irrelevant. - -BUILD_DB=0 - -# Two libraries are needed: SQLite3 and ohash(3). -# Autoconfiguration tries the following linker flags to find them. -# If none of these work, add a working DBLIB line to configure.local, -# disabling autodetection for library directories. - -DBLIB="-lsqlite3" -DBLIB="-lsqlite3 -lutil" -DBLIB="-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 DBLIB to something including -L/usr/local/lib, +# If you manually set LD_OHASH 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. +# 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). -BINM_APROPOS=mapropos # default is "apropos" -BINM_WHATIS=mwhatis # default is "whatis" -BINM_MAKEWHATIS=mandocdb # default is "makewhatis" +LDADD="-lrt" +# Some systems may want to set additional linker flags for all the +# binaries, not only for those using libmandoc, for example for +# hardening options. + +LDFLAGS="-Wl,-z,relro" + +# It is possible to change the utility program used for installation +# and the modes files are installed with. The defaults are: + +INSTALL="install" +INSTALL_PROGRAM="${INSTALL} -m 0555" +INSTALL_LIB="${INSTALL} -m 0444" +INSTALL_MAN="${INSTALL} -m 0444" +INSTALL_DATA="${INSTALL} -m 0444" + # 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, @@ -180,11 +172,10 @@ BINM_MAKEWHATIS=mandocdb # default is "makewhatis" PREFIX="/usr/local" HOMEBREWDIR="${PREFIX}/Cellar" -# --- user settings related man.cgi ------------------------------------ +# --- user settings related to man.cgi --------------------------------- # By default, building man.cgi(8) is disabled. To enable it, copy # cgi.h.example to cgi.h, edit it, and use the following line. -# Obviously, this requires that BUILD_DB is enabled, too. BUILD_CGI=1 @@ -218,28 +209,42 @@ CGIBINDIR="${WWWPREFIX}/cgi-bin" CC=cc +# IBM AIX may need: + +CC=xlc + # The default compiler flags are: CFLAGS="-g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings" +# IBM AIX xlc does not support -W; in that case, please use: + +CFLAGS="-g" + # In rare cases, it may be required to skip individual automatic tests. # Each of the following variables can be set to 0 (test will not be run # and will be regarded as failed) or 1 (test will not be run and will # be regarded as successful). HAVE_DIRENT_NAMLEN=0 -HAVE_FGETLN=0 +HAVE_ERR=0 HAVE_FTS=0 +HAVE_GETLINE=0 HAVE_GETSUBOPT=0 -HAVE_MMAP=0 +HAVE_ISBLANK=0 +HAVE_MKDTEMP=0 +HAVE_OHASH=0 +HAVE_PLEDGE=0 +HAVE_PROGNAME=0 HAVE_REALLOCARRAY=0 +HAVE_REWB_BSD=0 +HAVE_REWB_SYSV=0 HAVE_STRCASESTR=0 +HAVE_STRINGLIST=0 HAVE_STRLCAT=0 HAVE_STRLCPY=0 HAVE_STRPTIME=0 HAVE_STRSEP=0 HAVE_STRTONUM=0 - -HAVE_SQLITE3=0 -HAVE_SQLITE3_ERRSTR=0 -HAVE_OHASH=0 +HAVE_VASPRINTF=0 +HAVE_WCHAR=0