]>
Commit | Line | Data |
---|---|---|
8c87197a | 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 | |
8c87197a | 3 | @@ -227,8 +225,8 @@ |
3d906a63 | 4 | echo "compiling the following source file:" >> $LOG |
8c87197a | 5 | cat $ODIR.tmp_src.cc >> $LOG |
3d906a63 | 6 | echo "using the following command line:" >> $LOG |
1238464b AG |
7 | - echo "$CXX $CXX_FLAGS -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc \"$1\"" >> $LOG |
8 | - $CXX $CXX_FLAGS -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $1 >> $LOG 2>&1 | |
9 | + echo "$CXX $CXX_FLAGS -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG | |
10 | + $CXX $CXX_FLAGS -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -L/usr/X11R6/lib $1 >> $LOG 2>&1 | |
77342933 | 11 | if [ $? -ne 0 ]; then |
3d906a63 | 12 | if [ -z "$4" ]; then |
77342933 | 13 | echo |
1238464b | 14 | @@ -1996,7 +1996,6 @@ |
fdb44af0 | 15 | --with-mkisofs=PATH location of mkisofs [$MKISOFS] |
1238464b AG |
16 | EOF |
17 | [ "$OS" = "linux" ] && echo " --with-linux=DIR Linux kernel source directory [$LINUX]" | |
18 | -[ $WITH_QT4 -eq 1 ] && echo " --with-qt-dir=DIR directory for Qt4 headers/libraries [pkgconfig]" | |
19 | [ $WITH_GSOAP -eq 1 ] && echo " --with-gsoap-dir=PATH directory for gSOAP compiler/headers/libraries" | |
20 | [ $WITH_GSOAP -eq 1 ] && echo " (soapcpp2 and wsdl2h, soapstd2.h, libgsoap++.a/so)" | |
21 | [ $WITH_GSOAP -eq 1 ] && echo " --with-gsoap-import=PATH directory for gSOAP import files (stlvector.h)" | |
8c87197a | 22 | @@ -1881,10 +1878,6 @@ |
210193ea | 23 | exit 1 |
24 | fi | |
3d906a63 | 25 | ;; |
8c87197a | 26 | - --with-qt-dir=*|--with-qt4-dir=*) |
6cd758ac | 27 | - QT4DIR=`echo $option | cut -d'=' -f2` |
41ff14a6 | 28 | - QT4DIR_PKGCONFIG=0 |
3d906a63 | 29 | - ;; |
1238464b AG |
30 | --with-openssl-dir=*) |
31 | OPENSSLDIR=`echo $option | cut -d'=' -f2` | |
32 | INCCRYPTO="-I${OPENSSLDIR}/include" |