Merge pull request #921 from tleedjarv/inotify-bsd

Enable building inotify fsmonitor on BSDs

INSTALL.md

@@ -34,6 +34,10 @@ Please refer to instructions provided by the repository.
 
 - lablgtk3 and its prerequisites (ocamlfind, GTK 3 and its dependencies)
 
+##### Optional, on BSDs
+
+- libinotify (optional, for building unison-fsmonitor)
+
 ##### Optional, for building the user manual
 
 - LaTeX

src/.depend

@@ -357,36 +357,36 @@ fs.cmx : \
 fs.cmi : \
     system/system_intf.cmo \
     fspath.cmi
-fsmonitor/linux/inotify.cmo : \
-    fsmonitor/linux/inotify.cmi
-fsmonitor/linux/inotify.cmx : \
-    fsmonitor/linux/inotify.cmi
-fsmonitor/linux/inotify.cmi :
-fsmonitor/linux/lwt_inotify.cmo : \
+fsmonitor/inotify/inotify.cmo : \
+    fsmonitor/inotify/inotify.cmi
+fsmonitor/inotify/inotify.cmx : \
+    fsmonitor/inotify/inotify.cmi
+fsmonitor/inotify/inotify.cmi :
+fsmonitor/inotify/lwt_inotify.cmo : \
     lwt/lwt_unix.cmi \
     lwt/lwt.cmi \
-    fsmonitor/linux/inotify.cmi \
-    fsmonitor/linux/lwt_inotify.cmi
-fsmonitor/linux/lwt_inotify.cmx : \
+    fsmonitor/inotify/inotify.cmi \
+    fsmonitor/inotify/lwt_inotify.cmi
+fsmonitor/inotify/lwt_inotify.cmx : \
     lwt/lwt_unix.cmx \
     lwt/lwt.cmx \
-    fsmonitor/linux/inotify.cmx \
-    fsmonitor/linux/lwt_inotify.cmi
-fsmonitor/linux/lwt_inotify.cmi : \
+    fsmonitor/inotify/inotify.cmx \
+    fsmonitor/inotify/lwt_inotify.cmi
+fsmonitor/inotify/lwt_inotify.cmi : \
     lwt/lwt.cmi \
-    fsmonitor/linux/inotify.cmi
-fsmonitor/linux/watcher.cmo : \
+    fsmonitor/inotify/inotify.cmi
+fsmonitor/inotify/watcher.cmo : \
     fsmonitor/watchercommon.cmi \
     lwt/lwt_unix.cmi \
-    fsmonitor/linux/lwt_inotify.cmi \
+    fsmonitor/inotify/lwt_inotify.cmi \
     lwt/lwt.cmi \
-    fsmonitor/linux/inotify.cmi
-fsmonitor/linux/watcher.cmx : \
+    fsmonitor/inotify/inotify.cmi
+fsmonitor/inotify/watcher.cmx : \
     fsmonitor/watchercommon.cmx \
     lwt/lwt_unix.cmx \
-    fsmonitor/linux/lwt_inotify.cmx \
+    fsmonitor/inotify/lwt_inotify.cmx \
     lwt/lwt.cmx \
-    fsmonitor/linux/inotify.cmx
+    fsmonitor/inotify/inotify.cmx
 fsmonitor/solaris/watcher.cmo : \
     fsmonitor/watchercommon.cmi \
     ubase/safelist.cmi \

src/Makefile.OCaml

@@ -330,7 +330,21 @@ clean::
 NAME_FSM = $(NAME)-fsmonitor
 
 ifeq ($(OSARCH),Linux)
-  FSMDIR = fsmonitor/linux
+  FSMDIR = fsmonitor/inotify
+endif
+
+ifneq ($(findstring $(OSARCH),FreeBSD OpenBSD NetBSD DragonFly),)
+  LIBINOTIFY_LIB:=-cclib '$(shell pkg-config --libs libinotify 2> /dev/null || printf ' -linotify')'
+  LIBINOTIFY_INC:=-ccopt '$(shell pkg-config --cflags libinotify 2> /dev/null)'
+  FOUND_LIBINOTIFY := $(shell { printf '' > inotifytest__.ml ;\
+    $(CAMLC) $(CAMLCFLAGS) $(CAMLLDFLAGS) $(LIBINOTIFY_LIB) \
+      -o inotifytest__ inotifytest__.ml > /dev/null 2>&1 && printf true ; } ;\
+    rm -f inotifytest__.ml inotifytest__.cm[oix] inotifytest__.o inotifytest__ > /dev/null 2>&1)
+  ifeq ($(FOUND_LIBINOTIFY), true)
+    FSMDIR = fsmonitor/inotify
+    $(NAME_FSM)$(EXEC_EXT): CAMLCFLAGS += $(LIBINOTIFY_INC)
+    $(NAME_FSM)$(EXEC_EXT): CLIBS += $(LIBINOTIFY_LIB)
+  endif
 endif
 
 ifeq ($(OSARCH),SunOS)
@@ -350,7 +364,7 @@ else
 	$(info fsmonitor implementation is not available or not configured for this system. fsmonitor will not be built.)
 endif
 
-DEP_INCLFLAGS+=-I fsmonitor -I fsmonitor/linux -I fsmonitor/solaris -I fsmonitor/windows
+DEP_INCLFLAGS+=-I fsmonitor -I fsmonitor/inotify -I fsmonitor/solaris -I fsmonitor/windows
 
 ####################################################################
 ### Dependencies