- added missing br

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

diff --git a/VirtualBox-configure.patch b/VirtualBox-configure.patch
index 524e86e1ca093f40846a80e259c56f0edea69978..139c4991471d11326c5bbea943bd9c83046e6519 100644 (file)
--- a/VirtualBox-configure.patch
+++ b/VirtualBox-configure.patch
@@ -1,14 +1,14 @@
---- configure.orig     2007-01-16 11:39:32.000000000 +0100
-+++ configure  2007-01-18 11:20:42.000000000 +0100
-@@ -51,7 +51,6 @@
+--- 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=""
  LIBPNG="-lpng"
--QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/share/qt3"
+-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"
- if [ -d /lib/modules/`uname -r`/build ]; then
-@@ -148,8 +147,8 @@
+ if [ -d "/lib/modules/`uname -r`/build" ]; then
+@@ -167,8 +166,8 @@
    echo "compiling the following source file:" >> $LOG
    cat .tmp_src.cc >> $LOG
    echo "using the following command line:" >> $LOG
@@ -16,40 +16,49 @@
 -  $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
-   if (($?!=0)); then
+   if [ $? -ne 0 ]; then
      if [ -z "$4" ]; then
-       echo -e "\n  $2 not found at $1 or $3 headers not found"
-@@ -873,29 +873,25 @@
+       echo
+@@ -873,38 +872,27 @@
  }
- ' > .tmp_src.cc
+ EOF
    found_qt=0
+-  libs="lib"
+-  [ "$LIB" = "lib64" ] && libs="$libs lib64"
 -  for q in $QTDIR; 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/lib -lqt-mt" >> $LOG
--    $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt >> $LOG 2>&1
--    if (($?==0)); then
--      if test_execute; then
--        cnf_append "QTDIR" `cd $q ; pwd`
--        found_qt=1
--        break
--      fi
+-    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 (($?==0)); then
++  if [ $? -eq 0 ]; then
 +    if test_execute; then
 +      found_qt=1
      fi
 -  done
 +  fi
-   if (($found_qt!=1)); then
--    echo -e "\n  Qt not found at \"$QTDIR\" or Qt headers not found"
-+    echo -e "\n  Qt not found or Qt headers not found"
-     echo      "  Check the file $LOG for detailed error information."
+   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
@@ -58,20 +67,20 @@
 -    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 (($?!=0)); then
+     if [ $? -ne 0 ]; then
        log_failure "not found"
        fail
-@@ -937,7 +932,6 @@
-   --with-iasl=PATH        the position of the iasl compiler [$IASL]
+@@ -1081,7 +1069,6 @@
+   --with-hal=LIB          location of the libhal libraries [$LIBHAL]
    --with-linux=DIR        Linux kernel source directory [$LINUX]
-   --with-mkisofs=PATH     position of mkisofs [$MKISOFS]
+   --with-mkisofs=PATH     location of mkisofs [$MKISOFS]
 -  --with-qt-dir=DIR       directory for QT headers/libraries [$QTDIR]
-   --with-xalan=LIB        position of the xalan library [$LIBXALAN]
-   --with-xerces=LIB       position of the xerces library [$LIBXERCES]
+   --with-xalan=LIB        location of the xalan library [$LIBXALAN]
+   --with-xerces=LIB       location of the xerces library [$LIBXERCES]
  
-@@ -970,9 +964,6 @@
-     --with-kbuild=*)
-       KBUILDDIR=`echo $option | cut -d'=' -f2`
+@@ -1118,9 +1105,6 @@
+         exit 1
+       fi
        ;;
 -    --with-qt-dir=*)
 -      QTDIR=`echo $option | cut -d'=' -f2`