Attempt to fix compatibility with libboost v1.34

kylewooten · Apr 7, 2010 · e439941 · e439941
1 parent 37650d8
commit e439941
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/configure b/configure
@@ -388,6 +388,7 @@ arg: with-libboost-inc=[path], Path to libboost include files
 arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
+#include <boost/version.hpp>
 class qc_libboost : public ConfObj
 {
 public:
@@ -451,7 +452,11 @@ public:
  // Find library
  s = conf->getenv("QC_WITH_LIBBOOST_LIB");
  QStringList required_libs;
- required_libs << "system" << "filesystem" << "thread";
+ required_libs 
+#if BOOST_VERSION >= 103500
+ << "system" 
+#endif
+ << "filesystem" << "thread";
  QStringList libDirs;
  libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
  foreach(const QString& lib, required_libs) {

diff --git a/qcm/libboost.qcm b/qcm/libboost.qcm
@@ -5,6 +5,7 @@ arg: with-libboost-inc=[path], Path to libboost include files
 arg: with-libboost-lib=[path], Path to libboost library files
 -----END QCMOD-----
 */
+#include <boost/version.hpp>
 class qc_libboost : public ConfObj
 {
 public:
@@ -68,7 +69,11 @@ public:
  // Find library
  s = conf->getenv("QC_WITH_LIBBOOST_LIB");
  QStringList required_libs;
- required_libs << "system" << "filesystem" << "thread";
+ required_libs 
+#if BOOST_VERSION >= 103500
+ << "system" 
+#endif
+ << "filesystem" << "thread";
  QStringList libDirs;
  libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
  foreach(const QString& lib, required_libs) {