From a5dfd4810918cbf3a4d57cc599ebc3b6215818ec Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 12 Jun 2012 02:22:31 -0500 Subject: Add lib64 to library search paths This is related to Bug 1016 --- configure | 15 +++++++++++---- 1 file 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; -- cgit v1.2.1