File: boost1.90.diff

package info (click to toggle)
libixion 0.20.0-7
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 4,556 kB
  • sloc: cpp: 21,271; sh: 4,561; makefile: 463; python: 297
file content (56 lines) | stat: -rw-r--r-- 1,676 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
diff --git a/configure.ac b/configure.ac
index 7dff9a01a8ef28c88bc76b81568262646ff80995..ef9f5ecdcf68fef4093978cf042ee3734df7d45e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,6 @@ AC_CHECK_SIZEOF([void *])
 CXXFLAGS="$CXXFLAGS -DSIZEOF_VOID_P=$ac_cv_sizeof_void_p"
 
 BOOST_REQUIRE([1.36])
-BOOST_FILESYSTEM
 
 # =====
 # Debug
diff --git a/src/libixion/module.cpp b/src/libixion/module.cpp
index b6a4dfff3df7c24283c6b49e55fce7ac6dfb1c6b..7bdf32cbde2979328ec58b3eebf449996d3479d5 100644
--- a/src/libixion/module.cpp
+++ b/src/libixion/module.cpp
@@ -10,7 +10,6 @@
 #include "ixion/compute_engine.hpp"
 #include <sstream>
 #include <vector>
-#include <boost/filesystem.hpp>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -18,8 +17,6 @@
 #include <dlfcn.h>
 #endif
 
-namespace fs = boost::filesystem;
-
 namespace ixion { namespace draft {
 
 namespace {
diff --git a/m4/boost.m4 b/m4/boost.m4
index 706035d31c9aefcba52ceacb839ab2f3ee0168d5..342516e445312787f87a88742c23c603c2d22a12 100644
--- a/m4/boost.m4
+++ b/m4/boost.m4
@@ -1332,11 +1332,16 @@ BOOST_DEFUN([String_Algo],
 # --------------------------------
 # Look for Boost.System.  For the documentation of PREFERRED-RT-OPT, see the
 # documentation of BOOST_FIND_LIB above.  This library was introduced in Boost
-# 1.35.0.
+# 1.35.0 and is header only since 1.70.
 BOOST_DEFUN([System],
-[BOOST_FIND_LIB([system], [$1],
+[
+if test $boost_major_version -ge 170; then
+  BOOST_FIND_HEADER([boost/system/error_code.hpp])
+else
+  BOOST_FIND_LIB([system], [$1],
                 [boost/system/error_code.hpp],
                 [boost::system::error_code e; e.clear();], [], [], [$2])
+fi
 ])# BOOST_SYSTEM