- libmagick configure improvement

kylewooten · Apr 11, 2008 · 54bf7e6 · 54bf7e6
1 parent 8422cb3
commit 54bf7e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/configure b/configure
@@ -594,9 +594,9 @@ public:
 
  s = conf->getenv("QC_WITH_LIBMAGICK_LIB");
  if(!s.isEmpty()) {
- if(!QFile::exists(s+QString("/libMagick++.so"))){
- return false;
- }
+ if(!conf->checkLibrary(s, "Magick++")) {
+ return false;
+ }
  }else{
  QStringList sl;
  sl << "/usr/lib/";
@@ -605,9 +605,9 @@ public:
  sl << "/usr/local/lib64/";
  bool found = false;
  foreach(s, sl){
- if(QFile::exists(s+QString("libMagick++.so"))){
+ if(conf->checkLibrary(s, "Magick++")) {
  found = true;
- break;
+ break;
  }
  }
  if(!found)

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