fdo#55435 orcus needs Boost.System with recent Boost

Change-Id: I2df230e0ca6293131ceaf9211fb301165981ab86

1 files changed, 25 insertions, 0 deletions

diff --git a/configure.ac b/configure.ac
index 42d6a20b59d8..74d9ca101f26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8782,7 +8782,32 @@ else
     AC_MSG_RESULT([internal])
     ORCUS_TARBALL=46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2
     SYSTEM_LIBORCUS=NO
+
+    if test "$SYSTEM_BOOST" = "YES"; then
+        # ===========================================================
+        # Determine if we are going to need to link with Boost.System
+        # ===========================================================
+        dnl This seems to be necessary since boost 1.50 (1.48 does not need it,
+        dnl 1.49 is untested). The macro BOOST_THREAD_DONT_USE_SYSTEM mentioned
+        dnl in documentation has no effect.
+        AC_MSG_CHECKING([if we need to link with Boost.System])
+        AC_LANG_PUSH([C++])
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+                @%:@include <boost/version.hpp>
+            ]],[[
+                #if BOOST_VERSION >= 105000
+                #   error yes, we need to link with Boost.System
+                #endif
+            ]])],[
+                AC_MSG_RESULT([no])
+            ],[
+                AC_MSG_RESULT([yes])
+                AX_BOOST_SYSTEM
+        ])
+        AC_LANG_POP([C++])
+    fi
 fi
+AC_SUBST([BOOST_SYSTEM_LIB])
 AC_SUBST(SYSTEM_LIBORCUS)
 AC_SUBST(ORCUS_CFLAGS)
 AC_SUBST(ORCUS_LIBS)