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

This commit is contained in:
Christophe Dumez 2007-10-14 09:15:02 +00:00
parent 902116cbc8
commit 6099544da5
5 changed files with 10 additions and 9 deletions

3
TODO
View File

@ -56,4 +56,5 @@
- Translations update (IN PROGRESS)
rc5->rc6 changelog:
- BUGFIX: configure looks for libraries in lib64 folders too
- BUGFIX: configure looks for libraries in lib64 folders too
- BUGFIX: configure doesn't require paths with a terminal "/" anymore

8
configure vendored
View File

@ -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:
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:
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{

View File

@ -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{

View File

@ -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{

View File

@ -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{