summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-12 02:22:31 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-12 02:22:31 -0500
commita5dfd4810918cbf3a4d57cc599ebc3b6215818ec (patch)
treed9dbb035341a07f52ec7b34c0d3cfa04df028670
parent5d65d09a869f9ab3267b47482c27e4b537d14e32 (diff)
downloadtqca-tls-a5dfd4810918cbf3a4d57cc599ebc3b6215818ec.tar.gz
tqca-tls-a5dfd4810918cbf3a4d57cc599ebc3b6215818ec.zip
Add lib64 to library search paths
This is related to Bug 1016
-rwxr-xr-xconfigure15
1 files changed, 11 insertions, 4 deletions
diff --git a/configure b/configure
index 8cbac11..2043c4e 100755
--- a/configure
+++ b/configure
@@ -60,7 +60,7 @@ if [ -z "$QTDIR" ]; then
if [ "$QC_DEBUG" = "Y" ]; then
echo \$QTDIR not set... trying to find Qt manually
fi
- for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
+ for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/tqt /usr/local/lib64/tqt /usr/lib64/tqt3 /usr/local/lib64/tqt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
if [ -d "$p/mkspecs" ]; then
QTDIR=$p
break;
@@ -394,6 +394,10 @@ public:
*lib = "/usr/local/lib";
return true;
}
+ if(checkLibrary("/usr/local/lib64", name)) {
+ *lib = "/usr/local/lib64";
+ return true;
+ }
return false;
}
@@ -539,9 +543,12 @@ if [ "$?" != "0" ]; then
echo "There was an error compiling 'conf'. Be sure you have a proper"
echo "TQt 3.x Multithreaded (MT) build environment set up."
if [ ! -f "$QTDIR/lib/libtqt-mt.so.3" ]; then
- echo
- echo "One possible reason is that you don't have"
- echo "libtqt-mt.so.3 installed in $QTDIR/lib/."
+ if [ ! -f "$QTDIR/lib64/libtqt-mt.so.3" ]; then
+ echo
+ echo "One possible reason is that you don't have"
+ echo "libtqt-mt.so.3 installed in $QTDIR/lib/"
+ echo "or $QTDIR/lib64/."
+ fi
fi
echo
exit 1;