- BUGFIX: configure doesn't require paths with a terminal "/" anymore

kylewooten · Oct 14, 2007 · 6099544 · 6099544
1 parent 902116c
commit 6099544
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/TODO b/TODO
@@ -56,4 +56,5 @@
 - Translations update (IN PROGRESS)
 
 rc5->rc6 changelog:
-- BUGFIX: configure looks for libraries in lib64 folders too
+- BUGFIX: configure looks for libraries in lib64 folders too
+- BUGFIX: configure doesn't require paths with a terminal "/" anymore
diff --git 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
@@ -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
@@ -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
@@ -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{