]>
Commit | Line | Data |
---|---|---|
41ff14a6 | 1 | diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure |
2 | --- VirtualBox-2.0.0.orig/configure 2008-09-03 16:59:10.000000000 +0200 | |
3 | +++ VirtualBox-2.0.0/configure 2008-09-04 20:04:52.000000000 +0200 | |
4 | @@ -69,11 +69,7 @@ | |
77342933 | 5 | INCPNG="" |
6 | LIBPNG="-lpng" | |
41ff14a6 | 7 | PYTHONDIR="/usr /usr/local" |
8 | -QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3" | |
9 | -QT3DIR="$QT3DIR /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt" | |
10 | -QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr" | |
11 | QT4DIR_PKGCONFIG=1 | |
6cd758ac | 12 | -QT4UIC3DIR="/usr/bin" |
fdb44af0 | 13 | KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild" |
14 | DEVDIR="`cd \`dirname $0\`; pwd`/tools" | |
77342933 | 15 | if [ -d "/lib/modules/`uname -r`/build" ]; then |
41ff14a6 | 16 | @@ -215,8 +211,8 @@ |
3d906a63 | 17 | echo "compiling the following source file:" >> $LOG |
18 | cat .tmp_src.cc >> $LOG | |
19 | echo "using the following command line:" >> $LOG | |
20 | - echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"$1\"" >> $LOG | |
21 | - $CXX -O -Wall -o .tmp_out .tmp_src.cc $1 >> $LOG 2>&1 | |
22 | + echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG | |
23 | + $CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib $1 >> $LOG 2>&1 | |
77342933 | 24 | if [ $? -ne 0 ]; then |
3d906a63 | 25 | if [ -z "$4" ]; then |
77342933 | 26 | echo |
41ff14a6 | 27 | @@ -1236,37 +1232,25 @@ |
3d906a63 | 28 | } |
77342933 | 29 | EOF |
3d906a63 | 30 | found_qt=0 |
210193ea | 31 | - libs="lib" |
32 | - [ "$LIB" = "lib64" ] && libs="$libs lib64" | |
6cd758ac | 33 | - for q in $QT3DIR; do |
210193ea | 34 | - for l in $libs; do |
35 | - echo "compiling the following source file:" >> $LOG | |
36 | - cat .tmp_src.cc >> $LOG | |
37 | - echo "using the following command line:" >> $LOG | |
fdb44af0 | 38 | - echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD" >> $LOG |
39 | - $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD >> $LOG 2>&1 | |
77342933 | 40 | - if [ $? -eq 0 ]; then |
210193ea | 41 | - if test_execute; then |
42 | - cnf_append "QTDIR" "`cd $q ; pwd`" | |
43 | - found_qt=1 | |
44 | - break | |
45 | - fi | |
46 | - fi | |
47 | - done | |
77342933 | 48 | - if [ $found_qt -eq 1 ]; then |
210193ea | 49 | - break |
fdb44af0 | 50 | + echo "compiling the following source file:" >> $LOG |
51 | + cat .tmp_src.cc >> $LOG | |
52 | + echo "using the following command line:" >> $LOG | |
53 | + echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt $LIBPTHREAD" >> $LOG | |
54 | + $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt $LIBPTHREAD >> $LOG 2>&1 | |
77342933 | 55 | + if [ $? -eq 0 ]; then |
3d906a63 | 56 | + if test_execute; then |
57 | + found_qt=1 | |
58 | fi | |
59 | - done | |
60 | + fi | |
77342933 | 61 | if [ $found_qt -ne 1 ]; then |
62 | echo | |
6cd758ac | 63 | - echo " Qt3 not found at \"$QT3DIR\" or Qt3 headers not found" |
77342933 | 64 | echo " Check the file $LOG for detailed error information." |
3d906a63 | 65 | fail |
66 | return 1 | |
67 | fi | |
6cd758ac | 68 | test_header "Qt3 devtools" |
69 | - if check_avail "$q/bin/moc" QT3DIR/bin; then | |
3d906a63 | 70 | - moc_ver=`$q/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'` |
71 | + if check_avail "/usr/bin/moc"; then | |
72 | + moc_ver=`/usr/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'` | |
77342933 | 73 | if [ $? -ne 0 ]; then |
3d906a63 | 74 | log_failure "not found" |
75 | fail | |
41ff14a6 | 76 | @@ -1343,21 +1327,19 @@ |
77 | #endif | |
78 | } | |
79 | EOF | |
80 | - for q in $QT4DIR; do | |
81 | - INCQT4="$q/include $q/include/QtCore" | |
82 | - FLGQT4="-DQT_SHARED" | |
83 | - I_INCQT4=`prefix_I "$INCQT4"` | |
84 | - LIBQT4="-L$q/lib -lVBoxQtCore" | |
85 | - if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then | |
86 | - foundqt4=2 | |
87 | - break; | |
88 | - fi | |
89 | - LIBQT4="-L$q/lib -lQtCore" | |
90 | - if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then | |
91 | - foundqt4=1 | |
92 | - break; | |
93 | - fi | |
94 | - done | |
95 | + INCQT4="/usr/include/qt4 /usr/include/qt/QtCore" | |
96 | + FLGQT4="-DQT_SHARED" | |
97 | + I_INCQT4=`prefix_I "$INCQT4"` | |
98 | + LIBQT4="-L/usr/lib/qt4 -lVBoxQtCore" | |
99 | + if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then | |
100 | + foundqt4=2 | |
101 | + break; | |
102 | + fi | |
103 | + LIBQT4="-L/usr/lib/qt4 -lQtCore" | |
104 | + if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then | |
105 | + foundqt4=1 | |
106 | + break; | |
107 | + fi | |
108 | fi | |
109 | fi | |
110 | if [ -n "$foundqt4" ]; then | |
111 | @@ -1393,21 +1375,19 @@ | |
112 | cnf_append "VBOX_WITH_QT4_SUN" "1" | |
113 | fi | |
6cd758ac | 114 | test_header "Qt4 devtools" |
115 | - for q in $QT4DIR; do | |
116 | - if which_wrapper "$q/bin/moc" > /dev/null; then | |
117 | - moc_ver=`$q/bin/moc -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'` | |
118 | - if [ $? -ne 0 ]; then | |
119 | - log_failure "not found" | |
120 | - fail | |
121 | - else | |
122 | - log_success "found version $moc_ver" | |
123 | - cnf_append "VBOX_PATH_QT4" "$q" | |
41ff14a6 | 124 | - cnf_append "PATH_SDK_QT4" "$q" |
125 | - cnf_append "PATH_TOOL_QT4" "$q" | |
126 | - return | |
127 | - fi | |
6cd758ac | 128 | + if which_wrapper "/usr/bin/moc-qt4" > /dev/null; then |
129 | + moc_ver=`/usr/bin/moc-qt4 -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'` | |
130 | + if [ $? -ne 0 ]; then | |
131 | + log_failure "not found" | |
132 | + fail | |
133 | + else | |
134 | + log_success "found version $moc_ver" | |
135 | + cnf_append "VBOX_PATH_QT4" "$q" | |
41ff14a6 | 136 | + cnf_append "PATH_SDK_QT4" "$q" |
137 | + cnf_append "PATH_TOOL_QT4" "$q" | |
138 | + return | |
6cd758ac | 139 | fi |
140 | - done | |
141 | + fi | |
142 | fi | |
143 | fi | |
144 | else | |
41ff14a6 | 145 | @@ -1765,8 +1745,6 @@ |
fdb44af0 | 146 | --with-iasl=PATH location of the iasl compiler [$IASL] |
147 | --with-linux=DIR Linux kernel source directory [$LINUX] | |
148 | --with-mkisofs=PATH location of mkisofs [$MKISOFS] | |
6cd758ac | 149 | - --with-qt-dir=DIR directory for Qt3 headers/libraries [$QT3DIR] |
41ff14a6 | 150 | - --with-qt4-dir=DIR directory for Qt4 headers/libraries [pkgconfig] |
6cd758ac | 151 | |
152 | Build type: | |
153 | -d, --build-debug build with debugging symbols and assertions | |
41ff14a6 | 154 | @@ -1809,13 +1787,6 @@ |
210193ea | 155 | exit 1 |
156 | fi | |
3d906a63 | 157 | ;; |
158 | - --with-qt-dir=*) | |
6cd758ac | 159 | - QT3DIR=`echo $option | cut -d'=' -f2` |
160 | - ;; | |
161 | - --with-qt4-dir=*) | |
162 | - QT4DIR=`echo $option | cut -d'=' -f2` | |
41ff14a6 | 163 | - QT4DIR_PKGCONFIG=0 |
3d906a63 | 164 | - ;; |
77342933 | 165 | --with-iasl=*) |
166 | IASL=`echo $option | cut -d'=' -f2` | |
3d906a63 | 167 | ;; |