---- configure.orig 2007-08-23 21:34:25.000000000 +0200
-+++ configure 2007-08-23 21:39:54.000000000 +0200
-@@ -57,7 +57,6 @@
- LIBZ="-lz"
- INCPNG=""
+--- VirtualBox-2.2.0_OSE/configure.orig 2009-04-12 13:55:00.000000000 +0200
++++ VirtualBox-2.2.0_OSE/configure 2009-04-12 14:03:10.000000000 +0200
+@@ -100,9 +100,7 @@
LIBPNG="-lpng"
--QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6"
- KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
- DEVDIR="`cd $(dirname $0); pwd`/tools"
+ PKGCONFIG="`which_wrapper pkg-config`"
+ PYTHONDIR="/usr /usr/local"
+-QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr/lib64/qt4 /usr"
+ QT4DIR_PKGCONFIG=1
+-QT4UIC3DIR="/usr/bin"
+ KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
+ DEVDIR="`cd \`dirname $0\`; pwd`/tools"
if [ -d "/lib/modules/`uname -r`/build" ]; then
-@@ -167,8 +166,8 @@
+@@ -227,8 +225,8 @@
echo "compiling the following source file:" >> $LOG
- cat .tmp_src.cc >> $LOG
+ cat $ODIR.tmp_src.cc >> $LOG
echo "using the following command line:" >> $LOG
-- echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc \"$1\"" >> $LOG
-- $CXX -O -Wall -o .tmp_out .tmp_src.cc $1 >> $LOG 2>&1
-+ echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG
-+ $CXX -O -Wall -o .tmp_out .tmp_src.cc -L/usr/X11R6/lib $1 >> $LOG 2>&1
+- echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc \"$1\"" >> $LOG
+- $CXX -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $1 >> $LOG 2>&1
++ echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG
++ $CXX -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -L/usr/X11R6/lib $1 >> $LOG 2>&1
if [ $? -ne 0 ]; then
if [ -z "$4" ]; then
echo
-@@ -873,38 +872,27 @@
- }
- EOF
- found_qt=0
-- libs="lib"
-- [ "$LIB" = "lib64" ] && libs="$libs lib64"
-- for q in $QTDIR; do
-- for l in $libs; do
-- echo "compiling the following source file:" >> $LOG
-- cat .tmp_src.cc >> $LOG
-- echo "using the following command line:" >> $LOG
-- echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt" >> $LOG
-+ echo "compiling the following source file:" >> $LOG
-+ cat .tmp_src.cc >> $LOG
-+ echo "using the following command line:" >> $LOG
-+ echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt" >> $LOG
-
-- $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt >> $LOG 2>&1
-- if [ $? -eq 0 ]; then
-- if test_execute; then
-- cnf_append "QTDIR" "`cd $q ; pwd`"
-- found_qt=1
-- break
-- fi
-- fi
-- done
-- if [ $found_qt -eq 1 ]; then
-- break
-+ $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt >> $LOG 2>&1
-+ if [ $? -eq 0 ]; then
-+ if test_execute; then
-+ found_qt=1
- fi
-- done
-+ fi
- if [ $found_qt -ne 1 ]; then
- echo
-- echo " Qt not found at \"$QTDIR\" or Qt headers not found"
-+ echo " Qt not found or Qt headers not found"
- echo " Check the file $LOG for detailed error information."
- fail
- return 1
- fi
- test_header "Qt devtools"
-- if check_avail "$q/bin/moc" QTDIR/bin; then
-- moc_ver=`$q/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'`
-+ if check_avail "/usr/bin/moc"; then
-+ moc_ver=`/usr/bin/moc 2>&1 -v|sed 's+^.*(Qt \(.*\))+\1+'`
- if [ $? -ne 0 ]; then
- log_failure "not found"
- fail
-@@ -1081,7 +1069,6 @@
- --with-hal=LIB location of the libhal libraries [$LIBHAL]
- --with-linux=DIR Linux kernel source directory [$LINUX]
- --with-mkisofs=PATH location of mkisofs [$MKISOFS]
-- --with-qt-dir=DIR directory for QT headers/libraries [$QTDIR]
- --with-xalan=LIB location of the xalan library [$LIBXALAN]
- --with-xerces=LIB location of the xerces library [$LIBXERCES]
-
-@@ -1118,9 +1105,6 @@
+@@ -1385,7 +1383,7 @@
+ cnf_append "VBOX_WITH_QT4_SUN" "1"
+ fi
+ test_header "Qt4 devtools"
+- for q in $QT4DIR; do
++ for q in /usr/lib/qt4 /usr/lib64/qt4; do
+ if which_wrapper "$q/bin/moc" > /dev/null; then
+ moc_ver=`$q/bin/moc -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
+ if [ $? -ne 0 ]; then
+@@ -1836,7 +1834,6 @@
+ --with-iasl=PATH location of the iasl compiler [$IASL]
+ --with-linux=DIR Linux kernel source directory [$LINUX]
+ --with-mkisofs=PATH location of mkisofs [$MKISOFS]
+- --with-qt-dir=DIR directory for Qt4 headers/libraries [pkgconfig]
+ --with-gsoap-dir=PATH directory for gSOAP compiler/headers/libraries
+ (soapcpp2 and wsdl2h, soapstd2.h, libgsoap++.a/so)
+ --with-gsoap-import=PATH directory for gSOAP import files (stlvector.h)
+@@ -1881,10 +1878,6 @@
exit 1
fi
;;
-- --with-qt-dir=*)
-- QTDIR=`echo $option | cut -d'=' -f2`
+- --with-qt-dir=*|--with-qt4-dir=*)
+- QT4DIR=`echo $option | cut -d'=' -f2`
+- QT4DIR_PKGCONFIG=0
- ;;
- --with-iasl=*)
- IASL=`echo $option | cut -d'=' -f2`
+ --with-gsoap-dir=*)
+ GSOAP=`echo $option | cut -d'=' -f2`
;;
projects / packages / VirtualBox.git / blobdiff