- more lang

[packages/VirtualBox.git] / VirtualBox-configure.patch

--- 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"
 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
@@ -227,8 +225,8 @@
   echo "compiling the following source file:" >> $LOG
   cat $ODIR.tmp_src.cc >> $LOG
   echo "using the following command line:" >> $LOG
-  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
@@ -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=*|--with-qt4-dir=*)
-      QT4DIR=`echo $option | cut -d'=' -f2`
-      QT4DIR_PKGCONFIG=0
-      ;;
     --with-gsoap-dir=*)
       GSOAP=`echo $option | cut -d'=' -f2`
       ;;