From 4f936f9d82fe60ef2726395e584b38f2d5359978 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 2 Apr 2008 08:24:25 +0000
Subject: [PATCH] From Bertrand: - Fix detection of Qt4 libraries
git-svn-id: http://root.cern.ch/svn/root/trunk@22935 27541ba8-7e3a-0410-8455-c3a389f83636
---
configure | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 7d4d5ff371b..87bb1a647ef 100755
--- a/configure
+++ b/configure
@@ -434,6 +434,7 @@ check_library() {
if (test "x$found_lib" = "x$flib" && test "x$shared" = "xno") || \
test "x$maclib" = "xyes" ; then
found_lib=${found_dir}/${found_lib}
+ found_raw_dir=${found_dir}
found_dir=""
else
found_lib=`echo $found_lib | sed 's|^lib\(.*\)\..*|-l\1|'`
@@ -2053,24 +2054,24 @@ if test ! "x$enable_qt" = "xno" || \
if test "x$enable_winrtdebug" = "xyes"; then
qt4suffix="d4"
fi
- check_library "libQtCore QtCore QtCore$qt4suffix" "$enable_shared" \
+ check_library "libQtCore QtCore QtCore$qt4suffix QtCore4" "$enable_shared" \
"$qtlibdir" $QTDIR $QTDIR/lib /usr/local/lib \
/usr/local/qt/lib /usr/lib /usr/qt/lib
qtlib=$found_lib
qtlibdir=$found_dir
- check_library "libQtGui QtGui QtGui$qt4suffix" "$enable_shared" \
+ check_library "libQtGui QtGui QtGui$qt4suffix QtGui4" "$enable_shared" \
"$found_raw_dir" ""
qtlib="$qtlib $found_lib"
- check_library "libQt3Support Qt3Support Qt3Support$qt4suffix" \
+ check_library "libQt3Support Qt3Support Qt3Support$qt4suffix Qt3Support4" \
"$enable_shared" "$found_raw_dir" ""
qtlib="$qtlib $found_lib"
- check_library "libQtOpenGL QtOpenGL QtOpenGL$qt4suffix" \
+ check_library "libQtOpenGL QtOpenGL QtOpenGL$qt4suffix QtOpenGL4" \
"$enable_shared" "$found_raw_dir" ""
qtlib="$qtlib $found_lib"
- check_library "libQtSvg QtSvg QtSvg$qt4suffix" "$enable_shared" \
+ check_library "libQtSvg QtSvg QtSvg$qt4suffix QtSvg4" "$enable_shared" \
"$found_raw_dir" ""
qtlib="$qtlib $found_lib"
- check_library "libQtXml QtXml QtXml$qt4suffix" "$enable_shared" \
+ check_library "libQtXml QtXml QtXml$qt4suffix QtXml4" "$enable_shared" \
"$found_raw_dir" ""
qtlib="$qtlib $found_lib"
else
--
GitLab