VirtualBox-configure.patch

   1 --- configure.orig      2008-04-30 16:06:04.000000000 +0200
   2 +++ configure   2008-05-05 09:33:29.000000000 +0200
   3 @@ -66,9 +66,6 @@
   4  LIBZ="-lz"
   5  INCPNG=""
   6  LIBPNG="-lpng"
   7 -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"
   8 -QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr"
   9 -QT4UIC3DIR="/usr/bin"
  10  KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
  11  DEVDIR="`cd \`dirname $0\`; pwd`/tools"
  12  if [ -d "/lib/modules/`uname -r`/build" ]; then
  13 @@ -207,8 +204,8 @@
  14    echo "compiling the following source file:" >> $LOG
  15    cat .tmp_src.cc >> $LOG
  16    echo "using the following command line:" >> $LOG
  17 -  echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"$1\"" >> $LOG
  18 -  $CXX -O -Wall -o .tmp_out .tmp_src.cc $1 >> $LOG 2>&1
  19 +  echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG
  20 +  $CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib $1 >> $LOG 2>&1
  21    if [ $? -ne 0 ]; then
  22      if [ -z "$4" ]; then
  23        echo
  24 @@ -1181,37 +1178,25 @@
  25  }
  26  EOF
  27    found_qt=0
  28 -  libs="lib"
  29 -  [ "$LIB" = "lib64" ] && libs="$libs lib64"
  30 -  for q in $QT3DIR; do
  31 -    for l in $libs; do
  32 -      echo "compiling the following source file:" >> $LOG
  33 -      cat .tmp_src.cc >> $LOG
  34 -      echo "using the following command line:" >> $LOG
  35 -      echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD" >> $LOG
  36 -      $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD >> $LOG 2>&1
  37 -      if [ $? -eq 0 ]; then
  38 -        if test_execute; then
  39 -          cnf_append "QTDIR" "`cd $q ; pwd`"
  40 -          found_qt=1
  41 -          break
  42 -        fi
  43 -      fi
  44 -    done
  45 -    if [ $found_qt -eq 1 ]; then
  46 -      break
  47 +  echo "compiling the following source file:" >> $LOG
  48 +  cat .tmp_src.cc >> $LOG
  49 +  echo "using the following command line:" >> $LOG
  50 +  echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt $LIBPTHREAD" >> $LOG
  51 +  $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt $LIBPTHREAD >> $LOG 2>&1
  52 +  if [ $? -eq 0 ]; then
  53 +    if test_execute; then
  54 +      found_qt=1
  55      fi
  56 -  done
  57 +  fi
  58    if [ $found_qt -ne 1 ]; then
  59      echo
  60 -    echo "  Qt3 not found at \"$QT3DIR\" or Qt3 headers not found"
  61      echo "  Check the file $LOG for detailed error information."
  62      fail
  63      return 1
  64    fi
  65    test_header "Qt3 devtools"
  66 -  if check_avail "$q/bin/moc" QT3DIR/bin; then
  67 -    moc_ver=`$q/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'`
  68 +  if check_avail "/usr/bin/moc"; then
  69 +    moc_ver=`/usr/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'`
  70      if [ $? -ne 0 ]; then
  71        log_failure "not found"
  72        fail
  73 @@ -1280,40 +1265,34 @@
  74      [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"`
  75      if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLDQT4" qt4 qt4 nofatal; then
  76        if test_execute; then
  77 -#        cnf_append "SDK_VBOX_LIBQT4_INCS" "$INCQT4"
  78 -#        cnf_append "SDK_VBOX_LIBQT4_LIBS" "`strip_l "$LIBQT4"`"
  79          if [ "$OS" = "darwin" ]; then
  80            cnf_append "VBOX_WITH_QT4GUI" "1"
  81          else
  82            test_header "Qt4 devtools"
  83 -          for q in $QT4DIR; do
  84 -            if which_wrapper "$q/bin/moc" > /dev/null; then
  85 -              moc_ver=`$q/bin/moc -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
  86 -              if [ $? -ne 0 ]; then
  87 -                log_failure "not found"
  88 -                fail
  89 -              else
  90 -                log_success "found version $moc_ver"
  91 -                cnf_append "VBOX_PATH_QT4" "$q"
  92 -                test_header "Qt4 uic3"
  93 -                for r in $q/bin $QT4UIC3DIR; do
  94 -                  if which_wrapper "$r/uic3" > /dev/null; then
  95 -                    uic3_ver=`$r/uic3 -version 2>&1|sed 's+^.*version \(.*\)+\1+'`
  96 -                    if [ $? -ne 0 ]; then
  97 -                      log_failure "not found"
  98 -                      fail
  99 -                    else
 100 -                      log_success "found version $uic3_ver"
 101 -                      cnf_append "VBOX_UIC3" "$r/uic3"
 102 -                      return
 103 -                    fi
 104 -                  fi
 105 -                done
 106 -                log_failure "not found"
 107 -                fail
 108 +          if which_wrapper "/usr/bin/moc-qt4" > /dev/null; then
 109 +            moc_ver=`/usr/bin/moc-qt4 -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
 110 +            if [ $? -ne 0 ]; then
 111 +              log_failure "not found"
 112 +              fail
 113 +            else
 114 +              log_success "found version $moc_ver"
 115 +              cnf_append "VBOX_PATH_QT4" "$q"
 116 +              test_header "Qt4 uic3"
 117 +              if which_wrapper "/usr/bin/uic3" > /dev/null; then
 118 +                uic3_ver=`/usr/bin/uic3 -version 2>&1|sed 's+^.*version \(.*\)+\1+'`
 119 +                if [ $? -ne 0 ]; then
 120 +                  log_failure "not found"
 121 +                  fail
 122 +                else
 123 +                  log_success "found version $uic3_ver"
 124 +                  cnf_append "VBOX_UIC3" "$r/uic3"
 125 +                  return
 126 +                fi
 127                fi
 128 +              log_failure "not found"
 129 +              fail
 130              fi
 131 -          done
 132 +          fi
 133          fi
 134        fi
 135      else
 136 @@ -1604,8 +1583,6 @@
 137    --with-iasl=PATH         location of the iasl compiler [$IASL]
 138    --with-linux=DIR         Linux kernel source directory [$LINUX]
 139    --with-mkisofs=PATH      location of mkisofs [$MKISOFS]
 140 -  --with-qt-dir=DIR        directory for Qt3 headers/libraries [$QT3DIR]
 141 -  --with-qt4-dir=DIR       directory for Qt4 headers/libraries [$QT4DIR]
 142
 143  Build type:
 144    -d, --build-debug        build with debugging symbols and assertions
 145 @@ -1645,12 +1622,6 @@
 146          exit 1
 147        fi
 148        ;;
 149 -    --with-qt-dir=*)
 150 -      QT3DIR=`echo $option | cut -d'=' -f2`
 151 -      ;;
 152 -    --with-qt4-dir=*)
 153 -      QT4DIR=`echo $option | cut -d'=' -f2`
 154 -      ;;
 155      --with-iasl=*)
 156        IASL=`echo $option | cut -d'=' -f2`
 157        ;;