Browse Source

- Removed a fedora 7 workaround

adaptive-webui-19844
Christophe Dumez 17 years ago
parent
commit
b47073901f
  1. 10
      configure
  2. 10
      qcm/libcommoncpp2.qcm

10
configure vendored

@ -547,16 +547,6 @@ public:
} }
if(!found) return false; if(!found) return false;
conf->addLib(QString("-L") + s); conf->addLib(QString("-L") + s);
}
// BUGFIX for Fedora (doesn't support pkg-config?)
QFile issue_file("/etc/issue");
if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
QString content = issue_file.readAll();
issue_file.close();
if(content.indexOf("Fedora") != -1){
qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
conf->addLib("-pthread -lccext2 -lz -lccgnu2 -ldl -lrt");
}
} }
return true; return true;
} }

10
qcm/libcommoncpp2.qcm

@ -59,16 +59,6 @@ public:
} }
if(!found) return false; if(!found) return false;
conf->addLib(QString("-L") + s); conf->addLib(QString("-L") + s);
}
// BUGFIX for Fedora (doesn't support pkg-config?)
QFile issue_file("/etc/issue");
if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){
QString content = issue_file.readAll();
issue_file.close();
if(content.indexOf("Fedora") != -1){
qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled");
conf->addLib("-pthread -lccext2 -lz -lccgnu2 -ldl -lrt");
}
} }
return true; return true;
} }

Loading…
Cancel
Save