Deleted Added
sdiff udiff text old ( 276219 ) new ( 279527 )
full compact
configure (276219) configure (279527)
1#!/bin/sh
2#
1#!/bin/sh
2#
3# Copyright (c) 2014 Ingo Schwarze
3# Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
4#
5# Permission to use, copy, modify, and distribute this software for any
6# purpose with or without fee is hereby granted, provided that the above
7# copyright notice and this permission notice appear in all copies.
8#
9# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

--- 14 unchanged lines hidden (view full) ---

26
27exec 3> config.log
28echo "config.log: writing..."
29
30# --- default settings -------------------------------------------------
31# Initialize all variables here,
32# such that nothing can leak in from the environment.
33
4#
5# Permission to use, copy, modify, and distribute this software for any
6# purpose with or without fee is hereby granted, provided that the above
7# copyright notice and this permission notice appear in all copies.
8#
9# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

--- 14 unchanged lines hidden (view full) ---

26
27exec 3> config.log
28echo "config.log: writing..."
29
30# --- default settings -------------------------------------------------
31# Initialize all variables here,
32# such that nothing can leak in from the environment.
33
34VERSION="1.13.2"
35echo "VERSION=\"${VERSION}\"" 1>&2
36echo "VERSION=\"${VERSION}\"" 1>&3
37
38OSNAME=
39
40CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`
41CFLAGS="-g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings"
42DBLIB=
43STATIC="-static"
44
45BUILD_DB=1

--- 5 unchanged lines hidden (view full) ---

51HAVE_GETSUBOPT=
52HAVE_MMAP=
53HAVE_REALLOCARRAY=
54HAVE_STRCASESTR=
55HAVE_STRLCAT=
56HAVE_STRLCPY=
57HAVE_STRPTIME=
58HAVE_STRSEP=
34OSNAME=
35
36CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -`
37CFLAGS="-g -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings"
38DBLIB=
39STATIC="-static"
40
41BUILD_DB=1

--- 5 unchanged lines hidden (view full) ---

47HAVE_GETSUBOPT=
48HAVE_MMAP=
49HAVE_REALLOCARRAY=
50HAVE_STRCASESTR=
51HAVE_STRLCAT=
52HAVE_STRLCPY=
53HAVE_STRPTIME=
54HAVE_STRSEP=
55HAVE_STRTONUM=
59HAVE_WCHAR=
60
61HAVE_SQLITE3=
62HAVE_SQLITE3_ERRSTR=
63HAVE_OHASH=
64HAVE_MANPATH=
65
66PREFIX="/usr/local"
67BINDIR=
68SBINDIR=
69INCLUDEDIR=
70LIBDIR=
71MANDIR=
72EXAMPLEDIR=
56HAVE_WCHAR=
57
58HAVE_SQLITE3=
59HAVE_SQLITE3_ERRSTR=
60HAVE_OHASH=
61HAVE_MANPATH=
62
63PREFIX="/usr/local"
64BINDIR=
65SBINDIR=
66INCLUDEDIR=
67LIBDIR=
68MANDIR=
69EXAMPLEDIR=
70HOMEBREWDIR=
73
74WWWPREFIX="/var/www"
75HTDOCDIR=
76CGIBINDIR=
77
78BINM_APROPOS="apropos"
79BINM_MAN="man"
80BINM_WHATIS="whatis"

--- 90 unchanged lines hidden (view full) ---

171runtest getsubopt GETSUBOPT || true
172runtest mmap MMAP || true
173runtest reallocarray REALLOCARRAY || true
174runtest strcasestr STRCASESTR || true
175runtest strlcat STRLCAT || true
176runtest strlcpy STRLCPY || true
177runtest strptime STRPTIME || true
178runtest strsep STRSEP || true
71
72WWWPREFIX="/var/www"
73HTDOCDIR=
74CGIBINDIR=
75
76BINM_APROPOS="apropos"
77BINM_MAN="man"
78BINM_WHATIS="whatis"

--- 90 unchanged lines hidden (view full) ---

169runtest getsubopt GETSUBOPT || true
170runtest mmap MMAP || true
171runtest reallocarray REALLOCARRAY || true
172runtest strcasestr STRCASESTR || true
173runtest strlcat STRLCAT || true
174runtest strlcpy STRLCPY || true
175runtest strptime STRPTIME || true
176runtest strsep STRSEP || true
177runtest strtonum STRTONUM || true
179runtest wchar WCHAR || true
180
181# --- sqlite3 ---
182DETECTLIB=
183if [ ${BUILD_DB} -eq 0 ]; then
184 echo "BUILD_DB=0 (manual)" 1>&2
185 echo "BUILD_DB=0 (manual)" 1>&3
186 echo 1>&3

--- 82 unchanged lines hidden (view full) ---

269__HEREDOC__
270
271[ ${HAVE_FGETLN} -eq 0 -o ${HAVE_REALLOCARRAY} -eq 0 -o \
272 ${HAVE_STRLCAT} -eq 0 -o ${HAVE_STRLCPY} -eq 0 ] \
273 && echo "#include <sys/types.h>"
274[ ${HAVE_FGETLN} -eq 0 ] && echo "#include <stdio.h>"
275
276echo
178runtest wchar WCHAR || true
179
180# --- sqlite3 ---
181DETECTLIB=
182if [ ${BUILD_DB} -eq 0 ]; then
183 echo "BUILD_DB=0 (manual)" 1>&2
184 echo "BUILD_DB=0 (manual)" 1>&3
185 echo 1>&3

--- 82 unchanged lines hidden (view full) ---

268__HEREDOC__
269
270[ ${HAVE_FGETLN} -eq 0 -o ${HAVE_REALLOCARRAY} -eq 0 -o \
271 ${HAVE_STRLCAT} -eq 0 -o ${HAVE_STRLCPY} -eq 0 ] \
272 && echo "#include <sys/types.h>"
273[ ${HAVE_FGETLN} -eq 0 ] && echo "#include <stdio.h>"
274
275echo
277echo "#define VERSION \"${VERSION}\""
278[ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
276[ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\""
277[ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\""
279
280cat << __HEREDOC__
281#define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}
282#define HAVE_FGETLN ${HAVE_FGETLN}
283#define HAVE_FTS ${HAVE_FTS}
284#define HAVE_GETSUBOPT ${HAVE_GETSUBOPT}
285#define HAVE_MMAP ${HAVE_MMAP}
286#define HAVE_REALLOCARRAY ${HAVE_REALLOCARRAY}
287#define HAVE_STRCASESTR ${HAVE_STRCASESTR}
288#define HAVE_STRLCAT ${HAVE_STRLCAT}
289#define HAVE_STRLCPY ${HAVE_STRLCPY}
290#define HAVE_STRPTIME ${HAVE_STRPTIME}
291#define HAVE_STRSEP ${HAVE_STRSEP}
278
279cat << __HEREDOC__
280#define HAVE_DIRENT_NAMLEN ${HAVE_DIRENT_NAMLEN}
281#define HAVE_FGETLN ${HAVE_FGETLN}
282#define HAVE_FTS ${HAVE_FTS}
283#define HAVE_GETSUBOPT ${HAVE_GETSUBOPT}
284#define HAVE_MMAP ${HAVE_MMAP}
285#define HAVE_REALLOCARRAY ${HAVE_REALLOCARRAY}
286#define HAVE_STRCASESTR ${HAVE_STRCASESTR}
287#define HAVE_STRLCAT ${HAVE_STRLCAT}
288#define HAVE_STRLCPY ${HAVE_STRLCPY}
289#define HAVE_STRPTIME ${HAVE_STRPTIME}
290#define HAVE_STRSEP ${HAVE_STRSEP}
291#define HAVE_STRTONUM ${HAVE_STRTONUM}
292#define HAVE_WCHAR ${HAVE_WCHAR}
293#define HAVE_SQLITE3 ${HAVE_SQLITE3}
294#define HAVE_SQLITE3_ERRSTR ${HAVE_SQLITE3_ERRSTR}
295#define HAVE_OHASH ${HAVE_OHASH}
296#define HAVE_MANPATH ${HAVE_MANPATH}
297
298#define BINM_APROPOS "${BINM_APROPOS}"
299#define BINM_MAN "${BINM_MAN}"

--- 36 unchanged lines hidden (view full) ---

336 echo "extern size_t strlcat(char *, const char *, size_t);"
337
338[ ${HAVE_STRLCPY} -eq 0 ] && \
339 echo "extern size_t strlcpy(char *, const char *, size_t);"
340
341[ ${HAVE_STRSEP} -eq 0 ] && \
342 echo "extern char *strsep(char **, const char *);"
343
292#define HAVE_WCHAR ${HAVE_WCHAR}
293#define HAVE_SQLITE3 ${HAVE_SQLITE3}
294#define HAVE_SQLITE3_ERRSTR ${HAVE_SQLITE3_ERRSTR}
295#define HAVE_OHASH ${HAVE_OHASH}
296#define HAVE_MANPATH ${HAVE_MANPATH}
297
298#define BINM_APROPOS "${BINM_APROPOS}"
299#define BINM_MAN "${BINM_MAN}"

--- 36 unchanged lines hidden (view full) ---

336 echo "extern size_t strlcat(char *, const char *, size_t);"
337
338[ ${HAVE_STRLCPY} -eq 0 ] && \
339 echo "extern size_t strlcpy(char *, const char *, size_t);"
340
341[ ${HAVE_STRSEP} -eq 0 ] && \
342 echo "extern char *strsep(char **, const char *);"
343
344[ ${HAVE_STRTONUM} -eq 0 ] && \
345 echo "extern long long strtonum(const char *, long long, long long, const char **);"
346
344echo
345echo "#endif /* MANDOC_CONFIG_H */"
346
347echo "config.h: written" 1>&2
348echo "config.h: written" 1>&3
349
350# --- tests for Makefile.local -----------------------------------------
351

--- 22 unchanged lines hidden (view full) ---

374
375BUILD_TARGETS="base-build"
376[ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="${BUILD_TARGETS} cgi-build"
377INSTALL_TARGETS="base-install"
378[ ${BUILD_DB} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} db-install"
379[ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-install"
380
381cat << __HEREDOC__
347echo
348echo "#endif /* MANDOC_CONFIG_H */"
349
350echo "config.h: written" 1>&2
351echo "config.h: written" 1>&3
352
353# --- tests for Makefile.local -----------------------------------------
354

--- 22 unchanged lines hidden (view full) ---

377
378BUILD_TARGETS="base-build"
379[ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="${BUILD_TARGETS} cgi-build"
380INSTALL_TARGETS="base-install"
381[ ${BUILD_DB} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} db-install"
382[ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-install"
383
384cat << __HEREDOC__
382VERSION = ${VERSION}
383BUILD_TARGETS = ${BUILD_TARGETS}
384INSTALL_TARGETS = ${INSTALL_TARGETS}
385CFLAGS = ${CFLAGS}
386DBLIB = ${DBLIB}
387STATIC = ${STATIC}
388PREFIX = ${PREFIX}
389BINDIR = ${BINDIR}
390SBINDIR = ${SBINDIR}

--- 30 unchanged lines hidden --- 		385BUILD_TARGETS = ${BUILD_TARGETS}
386INSTALL_TARGETS = ${INSTALL_TARGETS}
387CFLAGS = ${CFLAGS}
388DBLIB = ${DBLIB}
389STATIC = ${STATIC}
390PREFIX = ${PREFIX}
391BINDIR = ${BINDIR}
392SBINDIR = ${SBINDIR}

--- 30 unchanged lines hidden ---