Fix building with --enable-async-push in FreeBSD

This option can be used in FreedBSD with devel/libinotify installed.

Detect presence of libinotify with pkgconf and use its word
to compile and link.

Trac: #1256

Signed-off-by: Lev Stipakov <lstipakov@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20200314052906.28095-1-lstipakov@gmail.com>
URL: https://www.mail-archive.com/search?l=mid&q=20200314052906.28095-1-lstipakov@gmail.com
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit e1eb630df1b3ef5df88afd51003fbec40e5d6d67)

diff --git a/configure.ac b/configure.ac
index e45ce2f306b4e601af2ed0d98d04f0084d73e129..469002817bc368d0816c455295b53bf64a04e5a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1328,11 +1328,25 @@ if test "${enable_plugin_auth_pam}" = "yes"; then
 fi
 
 if test "${enable_async_push}" = "yes"; then
-       AC_CHECK_HEADERS(
-               [sys/inotify.h],
-               AC_DEFINE([ENABLE_ASYNC_PUSH], [1], [Enable async push]),
-               AC_MSG_ERROR([inotify.h not found.])
-       )
+       case "$host" in
+               *-*-freebsd*)
+                       PKG_CHECK_MODULES(
+                               [OPTIONAL_INOTIFY],
+                               [libinotify],
+                               [
+                                       AC_DEFINE([HAVE_SYS_INOTIFY_H])
+                                       AC_DEFINE([ENABLE_ASYNC_PUSH], [1], [Enable async push])
+                               ]
+                       )
+               ;;
+               *)
+                       AC_CHECK_HEADERS(
+                               [sys/inotify.h],
+                               AC_DEFINE([ENABLE_ASYNC_PUSH], [1], [Enable async push]),
+                               AC_MSG_ERROR([inotify.h not found.])
+                       )
+               ;;
+       esac
 fi
 
 CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`"
@@ -1359,6 +1373,8 @@ AC_SUBST([OPTIONAL_LZ4_LIBS])
 AC_SUBST([OPTIONAL_SYSTEMD_LIBS])
 AC_SUBST([OPTIONAL_PKCS11_HELPER_CFLAGS])
 AC_SUBST([OPTIONAL_PKCS11_HELPER_LIBS])
+AC_SUBST([OPTIONAL_INOTIFY_CFLAGS])
+AC_SUBST([OPTIONAL_INOTIFY_LIBS])
 
 AC_SUBST([PLUGIN_AUTH_PAM_CFLAGS])
 AC_SUBST([PLUGIN_AUTH_PAM_LIBS])

diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am
index f3bf52f110871ba98d3e5497edc689aaa5916317..0ff23ba5dd6721c0f4a766d446fbe707bd034e03 100644 (file)
--- a/src/openvpn/Makefile.am
+++ b/src/openvpn/Makefile.am
@@ -28,6 +28,7 @@ AM_CFLAGS = \
        $(OPTIONAL_LZO_CFLAGS) \
        $(OPTIONAL_LZ4_CFLAGS) \
        $(OPTIONAL_PKCS11_HELPER_CFLAGS) \
+       $(OPTIONAL_INOTIFY_CFLAGS) \
        -DPLUGIN_LIBDIR=\"${plugindir}\"
 
 if WIN32
@@ -129,7 +130,8 @@ openvpn_LDADD = \
        $(OPTIONAL_CRYPTO_LIBS) \
        $(OPTIONAL_SELINUX_LIBS) \
        $(OPTIONAL_SYSTEMD_LIBS) \
-       $(OPTIONAL_DL_LIBS)
+       $(OPTIONAL_DL_LIBS) \
+       $(OPTIONAL_INOTIFY_LIBS)
 if WIN32
 openvpn_SOURCES += openvpn_win32_resources.rc block_dns.c block_dns.h
 openvpn_LDADD += -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm -lfwpuclnt -lrpcrt4 -lncrypt