Fix runtime openssl library detection on multiarch

pull/16/head
Timothy Pearson 13 years ago
parent 0f1209c4bb
commit 09d01cacf8

@ -28,7 +28,7 @@
#include <kconfig.h> #include <kconfig.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqdir.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -372,6 +372,18 @@ KConfig *cfg;
tmpStr.replace(TQRegExp("\\(.*\\)"), ""); tmpStr.replace(TQRegExp("\\(.*\\)"), "");
if (!access(tmpStr.latin1(), R_OK)) if (!access(tmpStr.latin1(), R_OK))
_cryptoLib = ll->globalLibrary(alib.latin1()); _cryptoLib = ll->globalLibrary(alib.latin1());
if (!_cryptoLib) {
// Multiarch triplet search
TQDir madir (*it);
TQStringList multiarchdirs = madir.entryList("*-*-*", TQDir::Dirs);
for (TQStringList::Iterator mait = multiarchdirs.begin(); mait != multiarchdirs.end(); ++mait ) {
TQString malib = *it + *mait + "/" + *shit;
TQString tmpStr(malib.latin1());
tmpStr.replace(TQRegExp("\\(.*\\)"), "");
if (!access(tmpStr.latin1(), R_OK))
_cryptoLib = ll->globalLibrary(malib.latin1());
}
}
if (_cryptoLib) break; if (_cryptoLib) break;
} }
if (_cryptoLib) break; if (_cryptoLib) break;
@ -530,6 +542,18 @@ KConfig *cfg;
tmpStr.replace(TQRegExp("\\(.*\\)"), ""); tmpStr.replace(TQRegExp("\\(.*\\)"), "");
if (!access(tmpStr.latin1(), R_OK)) if (!access(tmpStr.latin1(), R_OK))
_sslLib = ll->globalLibrary(alib.latin1()); _sslLib = ll->globalLibrary(alib.latin1());
if (!_sslLib) {
// Multiarch triplet search
TQDir madir (*it);
TQStringList multiarchdirs = madir.entryList("*-*-*", TQDir::Dirs);
for (TQStringList::Iterator mait = multiarchdirs.begin(); mait != multiarchdirs.end(); ++mait ) {
TQString malib = *it + *mait + "/" + *shit;
TQString tmpStr(malib.latin1());
tmpStr.replace(TQRegExp("\\(.*\\)"), "");
if (!access(tmpStr.latin1(), R_OK))
_sslLib = ll->globalLibrary(malib.latin1());
}
}
if (_sslLib) break; if (_sslLib) break;
} }
if (_sslLib) break; if (_sslLib) break;

Loading…
Cancel
Save