---- configure.orig 2008-04-30 16:06:04.000000000 +0200
-+++ configure 2008-05-05 09:33:29.000000000 +0200
-@@ -66,9 +66,6 @@
- LIBZ="-lz"
- INCPNG=""
- LIBPNG="-lpng"
--QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
--QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr"
--QT4UIC3DIR="/usr/bin"
- KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
- DEVDIR="`cd \`dirname $0\`; pwd`/tools"
- if [ -d "/lib/modules/`uname -r`/build" ]; then
-@@ -207,8 +204,8 @@
+--- 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
+@@ -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 $CXX_FLAGS -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc \"$1\"" >> $LOG
+- $CXX $CXX_FLAGS -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc $1 >> $LOG 2>&1
++ echo "$CXX $CXX_FLAGS -g -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -L/usr/X11R6/lib \"$1\"" >> $LOG
++ $CXX $CXX_FLAGS -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
-@@ -1181,37 +1178,25 @@
- }
- EOF
- found_qt=0
-- libs="lib"
-- [ "$LIB" = "lib64" ] && libs="$libs lib64"
-- for q in $QT3DIR; 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 $LIBPTHREAD" >> $LOG
-- $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD >> $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
-+ 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 $LIBPTHREAD" >> $LOG
-+ $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt $LIBPTHREAD >> $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 " Qt3 not found at \"$QT3DIR\" or Qt3 headers not found"
- echo " Check the file $LOG for detailed error information."
- fail
- return 1
- fi
- test_header "Qt3 devtools"
-- if check_avail "$q/bin/moc" QT3DIR/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
-@@ -1280,40 +1265,34 @@
- [ -n "$INCQT4" ] && I_INCQT4=`prefix_I "$INCQT4"`
- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLDQT4" qt4 qt4 nofatal; then
- if test_execute; then
--# cnf_append "SDK_VBOX_LIBQT4_INCS" "$INCQT4"
--# cnf_append "SDK_VBOX_LIBQT4_LIBS" "`strip_l "$LIBQT4"`"
- if [ "$OS" = "darwin" ]; then
- cnf_append "VBOX_WITH_QT4GUI" "1"
- else
- test_header "Qt4 devtools"
-- for q in $QT4DIR; 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
-- log_failure "not found"
-- fail
-- else
-- log_success "found version $moc_ver"
-- cnf_append "VBOX_PATH_QT4" "$q"
-- test_header "Qt4 uic3"
-- for r in $q/bin $QT4UIC3DIR; do
-- if which_wrapper "$r/uic3" > /dev/null; then
-- uic3_ver=`$r/uic3 -version 2>&1|sed 's+^.*version \(.*\)+\1+'`
-- if [ $? -ne 0 ]; then
-- log_failure "not found"
-- fail
-- else
-- log_success "found version $uic3_ver"
-- cnf_append "VBOX_UIC3" "$r/uic3"
-- return
-- fi
-- fi
-- done
-- log_failure "not found"
-- fail
-+ if which_wrapper "/usr/bin/moc-qt4" > /dev/null; then
-+ moc_ver=`/usr/bin/moc-qt4 -v 2>&1|sed 's+^.*(Qt \(.*\))+\1+'`
-+ if [ $? -ne 0 ]; then
-+ log_failure "not found"
-+ fail
-+ else
-+ log_success "found version $moc_ver"
-+ cnf_append "VBOX_PATH_QT4" "$q"
-+ test_header "Qt4 uic3"
-+ if which_wrapper "/usr/bin/uic3" > /dev/null; then
-+ uic3_ver=`/usr/bin/uic3 -version 2>&1|sed 's+^.*version \(.*\)+\1+'`
-+ if [ $? -ne 0 ]; then
-+ log_failure "not found"
-+ fail
-+ else
-+ log_success "found version $uic3_ver"
-+ cnf_append "VBOX_UIC3" "$r/uic3"
-+ return
-+ fi
- fi
-+ log_failure "not found"
-+ fail
- fi
-- done
-+ fi
- fi
- fi
- else
-@@ -1604,8 +1583,6 @@
- --with-iasl=PATH location of the iasl compiler [$IASL]
- --with-linux=DIR Linux kernel source directory [$LINUX]
+@@ -1996,7 +1996,6 @@
--with-mkisofs=PATH location of mkisofs [$MKISOFS]
-- --with-qt-dir=DIR directory for Qt3 headers/libraries [$QT3DIR]
-- --with-qt4-dir=DIR directory for Qt4 headers/libraries [$QT4DIR]
-
- Build type:
- -d, --build-debug build with debugging symbols and assertions
-@@ -1645,12 +1622,6 @@
+ EOF
+ [ "$OS" = "linux" ] && echo " --with-linux=DIR Linux kernel source directory [$LINUX]"
+-[ $WITH_QT4 -eq 1 ] && echo " --with-qt-dir=DIR directory for Qt4 headers/libraries [pkgconfig]"
+ [ $WITH_GSOAP -eq 1 ] && echo " --with-gsoap-dir=PATH directory for gSOAP compiler/headers/libraries"
+ [ $WITH_GSOAP -eq 1 ] && echo " (soapcpp2 and wsdl2h, soapstd2.h, libgsoap++.a/so)"
+ [ $WITH_GSOAP -eq 1 ] && echo " --with-gsoap-import=PATH directory for gSOAP import files (stlvector.h)"
+@@ -1881,10 +1878,6 @@
exit 1
fi
;;
-- --with-qt-dir=*)
-- QT3DIR=`echo $option | cut -d'=' -f2`
-- ;;
-- --with-qt4-dir=*)
+- --with-qt-dir=*|--with-qt4-dir=*)
- QT4DIR=`echo $option | cut -d'=' -f2`
+- QT4DIR_PKGCONFIG=0
- ;;
- --with-iasl=*)
- IASL=`echo $option | cut -d'=' -f2`
- ;;
+ --with-openssl-dir=*)
+ OPENSSLDIR=`echo $option | cut -d'=' -f2`
+ INCCRYPTO="-I${OPENSSLDIR}/include"
+--- VirtualBox-3.1.8_OSE/configure~ 2010-07-08 19:00:15.575150896 +0200
++++ VirtualBox-3.1.8_OSE/configure 2010-07-08 19:02:26.226178887 +0200
+@@ -1762,7 +1762,7 @@
+ found=
+ # For Solaris we use libpython2.4 for compatibility with Solaris 10 and passing IPS pkg audit
+ if [ "$OS" != "solaris" ]; then
+- SUPPYTHONLIBS="python2.6 python2.5 python2.4 python2.3"
++ SUPPYTHONLIBS="python2.7 python2.6 python2.5 python2.4 python2.3"
+ else
+ SUPPYTHONLIBS="python2.4"
+ fi
projects / packages / VirtualBox.git / blobdiff