diff options
author | Timothy Pearson <[email protected]> | 2012-06-12 02:19:46 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-06-12 02:19:46 -0500 |
commit | 4c8fa4b4685fbf69cb0ebb4fc9ca2405e030a5c1 (patch) | |
tree | 11d96ed6aba1ab4e641855d56837db9af70f0648 | |
parent | c663e43e7172bb80a8fb779e4dc74f579a60ec45 (diff) | |
download | tqca-4c8fa4b4685fbf69cb0ebb4fc9ca2405e030a5c1.tar.gz tqca-4c8fa4b4685fbf69cb0ebb4fc9ca2405e030a5c1.zip |
Add lib64 to library search directories
This is related to Bug 1016
-rwxr-xr-x | configure | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -52,7 +52,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/share/tqt /usr/share/tqt3 /usr/local/lib64/tqt /usr/local/share/tqt /usr/lib64/tqt3 /usr/local/lib64/tqt3 /usr/lib64/qt /usr/share/qt /usr/share/qt3 /usr/local/lib64/qt /usr/local/share/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do if [ -d "$p/mkspecs" ]; then QTDIR=$p break; @@ -300,6 +300,10 @@ public: *lib = "/usr/local/lib"; return true; } + if(checkLibrary("/usr/local/lib64", name)) { + *lib = "/usr/local/lib64"; + return true; + } return false; } @@ -444,9 +448,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; |