From 90ed80e67073551a6016a57cbfb8d9804446e173 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 11 Aug 2014 01:39:00 +0000 Subject: Provide a fallback version of fts(3) for systems lacking it. I chose the OpenBSD version because it apparently contains various bugfixes that never made it into libnbcompat. To reduce size and complexity, i stripped out the features we don't need. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9b0a08b6..3bfe2fac 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.436 2014/08/10 23:54:41 schwarze Exp $ +# $Id: Makefile,v 1.437 2014/08/11 01:39:00 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons # Copyright (c) 2011, 2013, 2014 Ingo Schwarze @@ -52,10 +52,8 @@ INSTALL_MAN = $(INSTALL_DATA) # --- user settings related to database support ------------------------ -# 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 +# Building apropos(1) and makewhatis(8) requires SQLite3. +# To avoid that dependency, comment the following line. # BUILD_TARGETS += db-build @@ -135,6 +133,7 @@ SRCS = apropos.c \ cgi.c \ chars.c \ compat_fgetln.c \ + compat_fts.c \ compat_getsubopt.c \ compat_ohash.c \ compat_reallocarray.c \ @@ -201,6 +200,7 @@ DISTFILES = INSTALL \ att.in \ cgi.h.example \ chars.in \ + compat_fts.h \ compat_ohash.h \ config.h.post \ config.h.pre \ @@ -282,6 +282,7 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ read.o COMPAT_OBJS = compat_fgetln.o \ + compat_fts.o \ compat_getsubopt.o \ compat_ohash.o \ compat_reallocarray.o \ -- cgit v1.2.3-56-ge451