Browse Source

- BUGFIX: configure doesn't require paths with a terminal "/" anymore

adaptive-webui-19844
Christophe Dumez 17 years ago
parent
commit
6099544da5
  1. 1
      TODO
  2. 8
      configure
  3. 4
      qcm/libcommoncpp2.qcm
  4. 2
      qcm/libmagick.qcm
  5. 2
      qcm/libzzip.qcm

1
TODO

@ -57,3 +57,4 @@ @@ -57,3 +57,4 @@
rc5->rc6 changelog:
- BUGFIX: configure looks for libraries in lib64 folders too
- BUGFIX: configure doesn't require paths with a terminal "/" anymore

8
configure vendored

@ -535,9 +535,9 @@ public: @@ -535,9 +535,9 @@ public:
s = conf->getenv("QC_WITH_LIBCOMMONCPP2_LIB");
if(!s.isEmpty()) {
if(!QFile::exists(s+QString("libccext2.so")))
if(!QFile::exists(s+QString("/libccext2.so")))
return false;
if(!QFile::exists(s+QString("libccgnu2.so")))
if(!QFile::exists(s+QString("/libccgnu2.so")))
return false;
conf->addLib(QString("-L") + s);
}else{
@ -618,7 +618,7 @@ public: @@ -618,7 +618,7 @@ public:
s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
if(!s.isEmpty()) {
if(!QFile::exists(s+QString("libMagick++.so"))){
if(!QFile::exists(s+QString("/libMagick++.so"))){
return false;
}
}else{
@ -698,7 +698,7 @@ public: @@ -698,7 +698,7 @@ public:
s = conf->getenv("QC_WITH_LIBZZIP_LIB");
if(!s.isEmpty()) {
if(!QFile::exists(s+QString("libzzip.so"))){
if(!QFile::exists(s+QString("/libzzip.so"))){
return false;
}
}else{

4
qcm/libcommoncpp2.qcm

@ -37,9 +37,9 @@ public: @@ -37,9 +37,9 @@ public:
s = conf->getenv("QC_WITH_LIBCOMMONCPP2_LIB");
if(!s.isEmpty()) {
if(!QFile::exists(s+QString("libccext2.so")))
if(!QFile::exists(s+QString("/libccext2.so")))
return false;
if(!QFile::exists(s+QString("libccgnu2.so")))
if(!QFile::exists(s+QString("/libccgnu2.so")))
return false;
conf->addLib(QString("-L") + s);
}else{

2
qcm/libmagick.qcm

@ -44,7 +44,7 @@ public: @@ -44,7 +44,7 @@ public:
s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
if(!s.isEmpty()) {
if(!QFile::exists(s+QString("libMagick++.so"))){
if(!QFile::exists(s+QString("/libMagick++.so"))){
return false;
}
}else{

2
qcm/libzzip.qcm

@ -44,7 +44,7 @@ public: @@ -44,7 +44,7 @@ public:
s = conf->getenv("QC_WITH_LIBZZIP_LIB");
if(!s.isEmpty()) {
if(!QFile::exists(s+QString("libzzip.so"))){
if(!QFile::exists(s+QString("/libzzip.so"))){
return false;
}
}else{

Loading…
Cancel
Save