VirtualBox

Changeset 10217

Show
Ignore:
Timestamp:
07/04/08 13:36:06 (2 months ago)
Author:
vboxsync
Message:

configure: write Qt4 pathes to AutoConfig?.kmk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure

    r10175 r10217  
    12481248      INCQT4="$PATH_SDK_QT4/Headers" 
    12491249      LIBQT4= 
    1250       FLDQT4="-framework QtCore" 
     1250      FLGQT4="-framework QtCore" 
    12511251    else 
    12521252      log_failure "Qt4 framework not found" 
    …… 
    12791279        FLGQT4="-DQT_SHARED" 
    12801280        I_INCQT4=`prefix_I "$INCQT4"` 
    1281         if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLDQT4" qt4 qt4 nofatal; then 
     1281        if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then 
    12821282          foundqt4=1 
    12831283          break; 
    …… 
    13021302EOF 
    13031303    [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"` 
    1304     if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLDQT4" qt4 qt4 nofatal; then 
     1304    if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then 
    13051305      if test_execute; then 
    1306 #        cnf_append "SDK_VBOX_LIBQT4_INCS" "$INCQT4" 
    1307 #        cnf_append "SDK_VBOX_LIBQT4_LIBS" "`strip_l "$LIBQT4"`" 
    1308         if [ "$OS" = "darwin" ]; then 
    1309           cnf_append "VBOX_WITH_QT4GUI" "1" 
    1310         else 
     1306        if [ "$OS" != "darwin" ]; then 
     1307          # strip .../QtCore as we add components ourself 
     1308          INCQT4=`echo "$INCQT4"|$KBUILD_SED 's|[^ ]*/QtCore||g; s| ||g'` 
     1309          cnf_append "VBOX_PATH_QT4_INCLUDE" "$INCQT4" 
     1310          cnf_append "VBOX_PATH_QT4_LIB" "`strip_L "$LIBQT4"`" 
    13111311          test_header "Qt4 devtools" 
    13121312          for q in $QT4DIR; do 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy