Browse Source

- libmagick configure improvement

adaptive-webui-19844
Christophe Dumez 17 years ago
parent
commit
54bf7e61f7
  1. 10
      configure
  2. 10
      qcm/libmagick.qcm

10
configure vendored

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

10
qcm/libmagick.qcm

@ -44,9 +44,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/";
@ -55,9 +55,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)

Loading…
Cancel
Save