Changeset 10348
- Timestamp:
- 07/08/08 09:29:00 (5 months ago)
- Files:
-
- trunk/configure (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/configure
r10302 r10348 68 68 LIBPNG="-lpng" 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 QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr "70 QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr" 71 71 QT4DIR_PKGCONFIG=1 72 72 QT4UIC3DIR="/usr/bin" … … 1314 1314 { 1315 1315 printf("found version %s", QT_VERSION_STR); 1316 #if QT_VERSION >= 0x040 2001316 #if QT_VERSION >= 0x040300 1317 1317 printf(", OK.\n"); 1318 1318 return 0; 1319 printf(", expected version 4. 2.0 or higher\n");1319 printf(", expected version 4.3.0 or higher\n"); 1320 1320 return 1; 1321 1321 #endif … … 1327 1327 if [ "$OS" != "darwin" ]; then 1328 1328 # strip .../QtCore as we add components ourself 1329 INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|[^ ]*/QtCore||g; s| ||g'` 1329 INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\)/QtCore|\1|g; s| $||g'` 1330 # store only the first path, remove all other pathes 1331 # most likely pkg-config gave us -I/usr/include/qt4 -I/usr/include/qt4/QtCore 1332 INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|\([^ ]*\) .*|\1|'` 1330 1333 cnf_append "VBOX_PATH_QT4_INCLUDE" "$INCQT4" 1331 1334 cnf_append "VBOX_PATH_QT4_LIB" "`strip_L "$LIBQT4"`" 1332 1333 1334 1335 if [ "$foundqt4" = "2" ]; then 1336 cnf_append "VBOX_WITH_QT4_SUN" "1" 1337 fi 1335 1338 test_header "Qt4 devtools" 1336 1339 for q in $QT4DIR; do … … 1342 1345 else 1343 1346 log_success "found version $moc_ver" 1347 cnf_append "VBOX_PATH_QT4_BIN" "$q/bin" 1344 1348 cnf_append "VBOX_PATH_QT4" "$q" 1345 1349 return
