Changeset 9671
- Timestamp:
- 06/13/08 09:43:52 (6 months ago)
- Files:
-
- trunk/configure (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/configure
r9479 r9671 69 69 QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt" 70 70 QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr" 71 QT4DIR_PKGCONFIG=1 71 72 QT4UIC3DIR="/usr/bin" 72 73 KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild" … … 1251 1252 fi 1252 1253 else 1253 if which_wrapper pkg-config > /dev/null; then 1254 qt4_ver=`pkg-config QtCore --modversion 2>> $LOG` 1255 if [ $? -ne 0 ]; then 1256 log_failure "not found" 1257 # fail 1254 if [ $QT4DIR_PKGCONFIG -eq 1 ]; then 1255 # default is to use pkg-config 1256 if which_wrapper pkg-config > /dev/null; then 1257 qt4_ver=`pkg-config QtCore --modversion 2>> $LOG` 1258 if [ $? -ne 0 ]; then 1259 log_failure "not found" 1260 # fail 1261 else 1262 FLGQT4=`pkg-config QtCore --cflags` 1263 INCQT4=`strip_I "$FLGQT4"` 1264 LIBQT4=`pkg-config QtCore --libs` 1265 foundqt4=1 1266 fi 1258 1267 else 1259 FLGQT4=`pkg-config QtCore --cflags` 1260 INCQT4=`strip_I "$FLGQT4"` 1261 LIBQT4=`pkg-config QtCore --libs` 1262 foundqt4=1 1268 log_failure "pkg-config not found" 1269 # not yet 1270 # fail 1263 1271 fi 1264 1272 else 1265 log_failure "pkg-config not found" 1266 # not yet 1267 # fail 1273 # do it the old way (e.g. user has specified QT4DIR) 1274 for q in $QT4DIR; do 1275 INCQT4="$q/include $q/include/QtCore" 1276 LIBQT4="-L$q/lib -lQtCore" 1277 FLGQT4="-DQT_SHARED" 1278 I_INCQT4=`prefix_I "$INCQT4"` 1279 if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLDQT4" qt4 qt4 nofatal; then 1280 foundqt4=1 1281 break; 1282 fi 1283 done 1268 1284 fi 1269 1285 fi … … 1611 1627 --with-mkisofs=PATH location of mkisofs [$MKISOFS] 1612 1628 --with-qt-dir=DIR directory for Qt3 headers/libraries [$QT3DIR] 1613 --with-qt4-dir=DIR directory for Qt4 headers/libraries [ $QT4DIR]1629 --with-qt4-dir=DIR directory for Qt4 headers/libraries [pkgconfig] 1614 1630 1615 1631 Build type: … … 1656 1672 --with-qt4-dir=*) 1657 1673 QT4DIR=`echo $option | cut -d'=' -f2` 1674 QT4DIR_PKGCONFIG=0 1658 1675 ;; 1659 1676 --with-iasl=*)
