|
|
@ -594,9 +594,9 @@ public: |
|
|
|
|
|
|
|
|
|
|
|
s = conf->getenv("QC_WITH_LIBMAGICK_LIB"); |
|
|
|
s = conf->getenv("QC_WITH_LIBMAGICK_LIB"); |
|
|
|
if(!s.isEmpty()) { |
|
|
|
if(!s.isEmpty()) { |
|
|
|
if(!QFile::exists(s+QString("/libMagick++.so"))){ |
|
|
|
if(!conf->checkLibrary(s, "Magick++")) { |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
QStringList sl; |
|
|
|
QStringList sl; |
|
|
|
sl << "/usr/lib/"; |
|
|
|
sl << "/usr/lib/"; |
|
|
@ -605,9 +605,9 @@ public: |
|
|
|
sl << "/usr/local/lib64/"; |
|
|
|
sl << "/usr/local/lib64/"; |
|
|
|
bool found = false; |
|
|
|
bool found = false; |
|
|
|
foreach(s, sl){ |
|
|
|
foreach(s, sl){ |
|
|
|
if(QFile::exists(s+QString("libMagick++.so"))){ |
|
|
|
if(conf->checkLibrary(s, "Magick++")) { |
|
|
|
found = true; |
|
|
|
found = true; |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
if(!found) |
|
|
|
if(!found) |
|
|
|