===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.433
retrieving revision 1.436
diff -u -p -r1.433 -r1.436
--- mandoc/Makefile	2014/08/08 20:34:06	1.433
+++ mandoc/Makefile	2014/08/10 23:54:41	1.436
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.433 2014/08/08 20:34:06 schwarze Exp $
+# $Id: Makefile,v 1.436 2014/08/10 23:54:41 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,8 +34,8 @@ VERSION		 = 1.13.1
 #
 CFLAGS	 	+= -DUSE_WCHAR
 
-CFLAGS		+= -g -DHAVE_CONFIG_H
-CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS		+= -g -W -Wall -Wstrict-prototypes
+CFLAGS     	+= -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 BINDIR		 = $(PREFIX)/bin
 INCLUDEDIR	 = $(PREFIX)/include/mandoc
@@ -52,9 +52,10 @@ INSTALL_MAN	 = $(INSTALL_DATA)
 
 # --- user settings related to database support ------------------------
 
-# If you want to build without database support, for example to avoid
-# the dependency on SQLite3, comment the following line.
-# However, you won't get apropos(1) and makewhatis(8) in that case.
+# Building apropos(1) and makewhatis(8) requires both SQLite3 and fts(3).
+# To avoid those dependencies, comment the following line.
+# Be careful: the fts(3) implementation in glibc is broken on 32bit
+# machines, see: https://sourceware.org/bugzilla/show_bug.cgi?id=15838
 #
 BUILD_TARGETS	+= db-build
 
@@ -488,7 +489,8 @@ mdocml.tar.gz: $(DISTFILES)
 
 config.h: configure config.h.pre config.h.post $(TESTSRCS)
 	rm -f config.log
-	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
+	CC="$(CC)" CFLAGS="$(CFLAGS)" DBLIB="$(DBLIB)" \
+		VERSION="$(VERSION)" ./configure
 
 .PHONY: 	 base-install cgi-install db-install install www-install
 .PHONY: 	 clean depend