[Libreoffice-commits] online.git: configure.ac
Corentin Noël (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 26 14:32:53 UTC 2020
configure.ac | 14 ++++++++++++++
1 file changed, 14 insertions(+)
New commits:
commit dbaf32c627a5c48b36c91bcee6fb5d94994c91da
Author: Corentin Noël <corentin.noel at collabora.com>
AuthorDate: Thu Mar 26 14:47:21 2020 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Mar 26 15:32:30 2020 +0100
autotools: Add support for atomic helper library
On some platforms like Raspbian Buster, loolwsd need to be linked to the atomic helper library.
Change-Id: I0a8b921d85d499040b2e65d480116cbcb14b5089
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91102
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/configure.ac b/configure.ac
index a90ee2d62..d6f4316ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,20 @@ for MODULE in lxml polib; do
fi
done
+# On some platforms, std::atomic needs a helper library
+AC_MSG_CHECKING([for the need of -latomic])
+AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include <atomic>
+ #include <cstdint>
+ std::atomic<std::int64_t> v;
+ int main() {
+ return v;
+ }
+ ])],
+ [AC_MSG_RESULT([No])],
+ [AC_MSG_RESULT([Yes])
+ LIBS="$LIBS -latomic"])
+
# Declare options
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug],
More information about the Libreoffice-commits
mailing list