diff -Naur qca-2.0-beta2-certs-sys/configure qca-2.0-beta2/configure
--- qca-2.0-beta2-certs-sys/configure	2006-04-06 20:14:44.000000000 -0400
+++ qca-2.0-beta2/configure	2006-04-09 21:06:24.000000000 -0400
@@ -314,35 +314,36 @@
 		QStringList pathsToTry;
 
 		path = conf->getenv("QC_CERTSTORE_PATH");
-		if(!path.isEmpty())
+		if(path.isEmpty())
 		{
-			if(QFile::exists(path))
-			{
-				QString certPathString = "QCA_SYSTEMSTORE_PATH='\"" + path + "\"'";
-				conf->addDefine(certPathString);
-				return true;
-			}
-			return false;
-		}
-
-		// This is from Debian
-		pathsToTry.append( QString("/etc/ssl/certs/ca-certificates.crt") );
+			// This is from Debian
+			pathsToTry.append( QString("/etc/ssl/certs/ca-certificates.crt") );
 
-		// Fedora Core 2 uses these
-		pathsToTry.append( QString("/usr/share/ssl/cert.pem") );
-		pathsToTry.append( QString("/usr/share/ssl/certs/ca-bundle.crt") );
+			// Fedora Core 2 uses these
+			pathsToTry.append( QString("/usr/share/ssl/cert.pem") );
+			pathsToTry.append( QString("/usr/share/ssl/certs/ca-bundle.crt") );
 
-		// Fedora Core 5 changes to this
-		pathsToTry.append( QString("/etc/pki/tls/cert.pem") );
+			// Fedora Core 5 and Mandriva Cooker uses this
+			pathsToTry.append( QString("/etc/pki/tls/cert.pem") );
 
-		for(int n = 0; n < pathsToTry.count(); ++n)
-		{
-        		if(QFile::exists(pathsToTry[n]))
+			for(int n = 0; n < pathsToTry.count(); ++n)
 			{
-				path = pathsToTry[n];
-				break;
+        			if(QFile::exists(pathsToTry[n]))
+				{
+					path = pathsToTry[n];
+					break;
+				}
 			}
 		}
+		else if (path == "%bundled%")
+		{
+			path = "";
+		}
+		else
+		{
+			if(!QFile::exists(path))
+				return false;
+		}
 
 		// fall back to bundled
 		if(path.isEmpty())