From 6099544da5c6c8a0554607afe6079b166351d4c2 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 14 Oct 2007 09:15:02 +0000
Subject: [PATCH] - BUGFIX: configure doesn't require paths with a terminal "/"
 anymore

---
 TODO                  | 3 ++-
 configure             | 8 ++++----
 qcm/libcommoncpp2.qcm | 4 ++--
 qcm/libmagick.qcm     | 2 +-
 qcm/libzzip.qcm       | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/TODO b/TODO
index 3b1a5a043..da99db305 100644
--- a/TODO
+++ b/TODO
@@ -56,4 +56,5 @@
 - Translations update (IN PROGRESS)
 
 rc5->rc6 changelog:
-- BUGFIX: configure looks for libraries in lib64 folders too
\ No newline at end of file
+- BUGFIX: configure looks for libraries in lib64 folders too
+- BUGFIX: configure doesn't require paths with a terminal "/" anymore
\ No newline at end of file
diff --git a/configure b/configure
index 8ce4a7c7f..2e0ffaa59 100755
--- a/configure
+++ b/configure
@@ -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{
diff --git a/qcm/libcommoncpp2.qcm b/qcm/libcommoncpp2.qcm
index 7e8aecd1a..76575b17d 100644
--- a/qcm/libcommoncpp2.qcm
+++ b/qcm/libcommoncpp2.qcm
@@ -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{
diff --git a/qcm/libmagick.qcm b/qcm/libmagick.qcm
index 65ec6d67b..04eca79d7 100644
--- a/qcm/libmagick.qcm
+++ b/qcm/libmagick.qcm
@@ -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{
diff --git a/qcm/libzzip.qcm b/qcm/libzzip.qcm
index bb2b9917e..acec24caa 100644
--- a/qcm/libzzip.qcm
+++ b/qcm/libzzip.qcm
@@ -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{