- Improve configure file output

kylewooten · Jan 19, 2010 · bc89845 · bc89845
1 parent 9ffe9c2
commit bc89845
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/configure b/configure
@@ -362,7 +362,7 @@ public:
  if(!libs.isEmpty())
  conf->addLib(libs);
  if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
- printf("\nWarning: libtorrent-rasterbar v%s was detected.\nSome feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+ printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
  else
  conf->addDefine("LIBTORRENT_0_15");
  return true;
@@ -438,10 +438,14 @@ public:
  qc_libnotify(Conf *c) : ConfObj(c) {}
  QString name() const { return "libnotify >= 0.4.2 (optional)"; }
  QString shortname() const { return "libnotify"; }
+ QString checkString() const {
+ if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+ return "";
+ return ConfObj::checkString();
+ }
  bool exec(){
- if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
- printf("\nNot Required");
- return true;
+ if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+ return false;
  }
  QStringList incs;
  QString req_ver = "0.4.2";
@@ -485,10 +489,14 @@ public:
  qc_geoip_database(Conf *c) : ConfObj(c) {}
  QString name() const { return "GeoIP Database (optional)"; }
  QString shortname() const { return "GeoIP Database"; }
+ QString checkString() const {
+ if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+ return "";
+ return ConfObj::checkString();
+ }
  bool exec() {
- if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
- printf("\nNot Required");
- return true;
+ if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+ return false;
  }
 #ifdef Q_WS_X11
  if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {

diff --git a/qcm/geoip-database.qcm b/qcm/geoip-database.qcm
@@ -11,10 +11,14 @@ public:
  qc_geoip_database(Conf *c) : ConfObj(c) {}
  QString name() const { return "GeoIP Database (optional)"; }
  QString shortname() const { return "GeoIP Database"; }
+ QString checkString() const {
+ if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+ return "";
+ return ConfObj::checkString();
+ }
  bool exec() {
- if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
- printf("\nNot Required");
- return true;
+ if(!conf->getenv("QC_DISABLE_geoip_database").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+ return false;
  }
 #ifdef Q_WS_X11
  if(!conf->getenv("QC_WITH_GEOIP_DATABASE_EMBEDDED").isEmpty()) {

diff --git a/qcm/libnotify.qcm b/qcm/libnotify.qcm
@@ -10,10 +10,14 @@ public:
  qc_libnotify(Conf *c) : ConfObj(c) {}
  QString name() const { return "libnotify >= 0.4.2 (optional)"; }
  QString shortname() const { return "libnotify"; }
+ QString checkString() const {
+ if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty())
+ return "";
+ return ConfObj::checkString();
+ }
  bool exec(){
- if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) {
- printf("\nNot Required");
- return true;
+ if(!conf->getenv("QC_DISABLE_libnotify").isEmpty() || !conf->getenv("QC_DISABLE_GUI").isEmpty()) {
+ return false;
  }
  QStringList incs;
  QString req_ver = "0.4.2";

diff --git a/qcm/libtorrent-rasterbar.qcm b/qcm/libtorrent-rasterbar.qcm
@@ -23,7 +23,7 @@ public:
  if(!libs.isEmpty())
  conf->addLib(libs);
  if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
- printf("\nWarning: libtorrent-rasterbar v%s was detected.\nSome feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
+ printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
  else
  conf->addDefine("LIBTORRENT_0_15");
  return true;