1 --- VirtualBox-2.2.0_OSE/configure.orig 2009-04-12 13:55:00.000000000 +0200
2 +++ VirtualBox-2.2.0_OSE/configure 2009-04-12 14:03:10.000000000 +0200
5 PKGCONFIG="`which_wrapper pkg-config`"
6 PYTHONDIR="/usr /usr/local"
7 -QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr"
10 KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
11 DEVDIR="`cd \`dirname $0\`; pwd`/tools"
12 if [ -d "/lib/modules/`uname -r`/build" ]; then
14 echo "compiling the following source file:" >> $LOG
15 cat $ODIR.tmp_src.cc >> $LOG
16 echo "using the following command line:" >> $LOG
17 - echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc \"$1\"" >> $LOG
18 - $CXX -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $1 >> $LOG 2>&1
19 + echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG
20 + $CXX -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -L/usr/X11R6/lib $1 >> $LOG 2>&1
25 cnf_append "VBOX_WITH_QT4_SUN" "1"
27 test_header "Qt4 devtools"
28 - for q in $QT4DIR; do
29 + for q in /usr/lib/qt4 /usr/lib64/qt4; do
30 if which_wrapper "$q/bin/moc" > /dev/null; then
31 moc_ver=`$q/bin/moc -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
34 --with-iasl=PATH location of the iasl compiler [$IASL]
35 --with-linux=DIR Linux kernel source directory [$LINUX]
36 --with-mkisofs=PATH location of mkisofs [$MKISOFS]
37 - --with-qt-dir=DIR directory for Qt4 headers/libraries [pkgconfig]
38 --with-gsoap-dir=PATH directory for gSOAP compiler/headers/libraries
39 (soapcpp2 and wsdl2h, soapstd2.h, libgsoap++.a/so)
40 --with-gsoap-import=PATH directory for gSOAP import files (stlvector.h)
41 @@ -1881,10 +1878,6 @@
45 - --with-qt-dir=*|--with-qt4-dir=*)
46 - QT4DIR=`echo $option | cut -d'=' -f2`
50 GSOAP=`echo $option | cut -d'=' -f2`