From 54bf7e61f78be72d12a57597a9ab8bee9fde5324 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Fri, 11 Apr 2008 16:47:55 +0000
Subject: [PATCH] - libmagick configure improvement

---
 configure         | 10 +++++-----
 qcm/libmagick.qcm | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index ac0af4282..b4777e9f5 100755
--- 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
index 04eca79d7..aea2a6c0f 100644
--- 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)