Hide all uses of boost filesystem in fs.cpp. Use readdir as an

alternate implementation for Unix and add some feature checks so a
boost-free build of the tests and command line are possible again.

6 files changed, 19 insertions, 3 deletions

diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index 6594cab69..d83529d5f 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -9,8 +9,8 @@ SO_OBJ_FLAGS   = %{shared_flags}
 LIB_LINK_CMD   = %{so_link}
 
 LIB_LINKS_TO   = %{link_to}
-APP_LINKS_TO   = $(LIB_LINKS_TO) -lboost_system
-TEST_LINKS_TO  = $(LIB_LINKS_TO) -lboost_filesystem -lboost_system
+APP_LINKS_TO   = $(LIB_LINKS_TO)
+TEST_LINKS_TO  = $(LIB_LINKS_TO)
 
 LIB_FLAGS      = $(SO_OBJ_FLAGS) $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS)
 APP_FLAGS      = $(LANG_FLAGS) $(APP_OPT) $(WARN_FLAGS)
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index d22b78b91..22e635352 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -13,6 +13,7 @@ dlopen
 gettimeofday
 gmtime_r
 memset_s
+readdir
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index 14e6c63e2..5df133c8e 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -1,6 +1,10 @@
 os_type unix
 
 <target_features>
-posix_mlock
+clock_gettime
 gettimeofday
+posix_mlock
+gmtime_r
+dlopen
+readdir
 </target_features>
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index 394f7673d..9061b31d8 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -6,6 +6,7 @@ gettimeofday
 posix_mlock
 gmtime_r
 dlopen
+readdir
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt
index 369b720c4..5df133c8e 100644
--- a/src/build-data/os/netbsd.txt
+++ b/src/build-data/os/netbsd.txt
@@ -1,5 +1,10 @@
 os_type unix
 
 <target_features>
+clock_gettime
 gettimeofday
+posix_mlock
+gmtime_r
+dlopen
+readdir
 </target_features>
diff --git a/src/build-data/os/openbsd.txt b/src/build-data/os/openbsd.txt
index 369b720c4..5df133c8e 100644
--- a/src/build-data/os/openbsd.txt
+++ b/src/build-data/os/openbsd.txt
@@ -1,5 +1,10 @@
 os_type unix
 
 <target_features>
+clock_gettime
 gettimeofday
+posix_mlock
+gmtime_r
+dlopen
+readdir
 </target_features>