forked from Lainports/opnsense-ports
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 699705dc1c91f41ea11eed4facb2d3756d899eec Mon Sep 17 00:00:00 2001
|
|
From: Julian Sikorski <belegdol@fedoraproject.org>
|
|
Date: Sat, 14 Mar 2020 14:06:34 +0100
|
|
Subject: [PATCH] Issue #3 - Define ASIO_ENABLE_BOOST when building collab
|
|
plugin
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This is needed for asio-1.14.0 or later as it defaults to
|
|
ASIO_STANDALONE if C++11 or later is detected:
|
|
https://github.com/chriskohlhoff/asio/commit/265e75cdbba739b1b1e3a46b283eaee3b9c60fe8
|
|
|
|
https://gitlab.gnome.org/World/AbiWord/issues/3
|
|
|
|
Signed-off-by: Hubert Figuière <hub@figuiere.net>
|
|
---
|
|
plugins/collab/plugin.m4 | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/plugins/collab/plugin.m4 b/plugins/collab/plugin.m4
|
|
index 7cfe3a138..a8a32c074 100644
|
|
--- plugins/collab/plugin.m4
|
|
+++ plugins/collab/plugin.m4
|
|
@@ -201,7 +201,7 @@ if test "$enable_collab_backend_sugar" = "yes"; then
|
|
COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SUGAR"
|
|
fi
|
|
if test "$enable_collab_backend_service" = "yes"; then
|
|
- COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SERVICE -DSOUP24"
|
|
+ COLLAB_CFLAGS="$COLLAB_CFLAGS -DABICOLLAB_HANDLER_SERVICE -DSOUP24 -DASIO_ENABLE_BOOST"
|
|
COLLAB_RCFLAGS="$COLLAB_RCFLAGS -DABICOLLAB_HANDLER_SERVICE"
|
|
fi
|
|
if test "$enable_collab_backend_sipsimple" = "yes"; then
|
|
--
|
|
GitLab
|
|
|