Merge branch 'master' into bloom

diff --combined Makefile
index 4832666b52b17decb3b170b10ca102c5a150ecbb,a4293c70855de02f0d9069ff3ec9e90ce4958886..a0404789cd1bfebf98cecf7e47b05c57ab155072
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,6 -1,7 +1,7 @@@
 -objects := adu.o string.o cmdline.o fd.o select.o create.o interactive.o select.cmdline.o format.o user.o
 +objects := adu.o string.o cmdline.o fd.o select.o create.o interactive.o select.cmdline.o format.o user.o bloom.o
  all: adu
  version := 0.0.5
+ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  
  DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
  DEBUG_CPPFLAGS += -Wredundant-decls
@@@ -13,13 -14,20 +14,20 @@@ CPPFLAGS += -Werror-implicit-function-d
  CPPFLAGS += -Wmissing-format-attribute
  CPPFLAGS += -Wunused-macros
  CPPFLAGS += -Wbad-function-cast
- CPPFLAGS += -D_LARGEFILE64_SOURCE
- CPPFLAGS += $(shell getconf LFS64_CFLAGS)
  CPPFLAGS += -DVERSION='"$(version)"'
+ CPPFLAGS += -I/usr/local/include
  
- LDFLAGS += -D_LARGEFILE64_SOURCE
- LDFLAGS += $(shell getconf LFS64_LDFLAGS)
- LDFLAGS += $(shell getconf LFS64_LIBS)
+ LDFLAGS += -L/usr/local/lib
+ 
+ 
+ ifeq (,$(findstring BSD,$(uname_S)))
+       CPPFLAGS += -D_LARGEFILE64_SOURCE
+       CPPFLAGS += $(shell getconf LFS64_CFLAGS)
+       LDFLAGS += -D_LARGEFILE64_SOURCE
+       LDFLAGS += $(shell getconf LFS64_LDFLAGS)
+       LDFLAGS += $(shell getconf LFS64_LIBS)
+       CPPFLAGS += -DHAVE_STAT64=1
+ endif
  
  
  Makefile.deps: $(wildcard *.c *.h)