From 34052ce8f954cde85918747692d765413016b9d8 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Fri, 9 Apr 2010 15:26:41 +0000 Subject: [PATCH] Less dependencies for nox --- configure | 12 ++++++++---- qcm/libboost.qcm | 8 +++++--- qcm/libtorrent-rasterbar.qcm | 4 +++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 9443bff75..274376dff 100755 --- a/configure +++ b/configure @@ -376,7 +376,9 @@ public: //conf->doCommand("pkg-config", params, &staticlibs); //conf->addLib(staticlibs.trimmed()); //libcrypto - conf->addLib("-lcrypto"); + if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { + conf->addLib("-lcrypto"); + } return true; } }; @@ -452,11 +454,13 @@ public: // Find library s = conf->getenv("QC_WITH_LIBBOOST_LIB"); QStringList required_libs; - required_libs #if BOOST_VERSION >= 103500 - << "system" + required_libs << "system"; #endif - << "filesystem" << "thread"; + if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { + // Not required by nox + required_libs << "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 index ec5c542ee..b5573c9c7 100644 --- a/qcm/libboost.qcm +++ b/qcm/libboost.qcm @@ -69,11 +69,13 @@ public: // Find library s = conf->getenv("QC_WITH_LIBBOOST_LIB"); QStringList required_libs; - required_libs #if BOOST_VERSION >= 103500 - << "system" + required_libs << "system"; #endif - << "filesystem" << "thread"; + if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { + // Not required by nox + required_libs << "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/libtorrent-rasterbar.qcm b/qcm/libtorrent-rasterbar.qcm index 16f606e2f..04c759efc 100644 --- a/qcm/libtorrent-rasterbar.qcm +++ b/qcm/libtorrent-rasterbar.qcm @@ -34,7 +34,9 @@ public: //conf->doCommand("pkg-config", params, &staticlibs); //conf->addLib(staticlibs.trimmed()); //libcrypto - conf->addLib("-lcrypto"); + if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { + conf->addLib("-lcrypto"); + } return true; } };