---- configure.orig 2007-01-16 11:39:32.000000000 +0100
-+++ configure 2007-01-18 11:20:42.000000000 +0100
-@@ -51,7 +51,6 @@
- LIBZ="-lz"
+diff -urN VirtualBox-2.0.0.orig/configure VirtualBox-2.0.0/configure
+--- VirtualBox-2.0.0.orig/configure 2008-09-03 16:59:10.000000000 +0200
++++ VirtualBox-2.0.0/configure 2008-09-04 20:04:52.000000000 +0200
+@@ -69,11 +69,7 @@
INCPNG=""
LIBPNG="-lpng"
--QTDIR="/usr/qt/3 /usr/share/qt3"
- KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
- DEVDIR="`cd $(dirname $0); pwd`/tools"
- if [ -d /lib/modules/`uname -r`/build ]; then
-@@ -148,8 +147,8 @@
+ PYTHONDIR="/usr /usr/local"
+-QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3"
+-QT3DIR="$QT3DIR /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
+-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
+@@ -215,8 +211,8 @@
echo "compiling the following source file:" >> $LOG
cat .tmp_src.cc >> $LOG
echo "using the following command line:" >> $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
- if (($?!=0)); then
+ if [ $? -ne 0 ]; then
if [ -z "$4" ]; then
- echo -e "\n $2 not found at $1 or $3 headers not found"
-@@ -804,29 +803,25 @@
+ echo
+@@ -1236,37 +1232,25 @@
}
- ' > .tmp_src.cc
+ EOF
found_qt=0
-- 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
+- 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" >> $LOG
-+ $CXX -O -Wall -o .tmp_out .tmp_src.cc -I/usr/include/qt -L/usr/lib -lqt-mt >> $LOG 2>&1
-+ if (($?==0)); then
++ 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!=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 " 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 "Qt devtools"
-- if check_avail "$q/bin/moc" QTDIR/bin; then
+ 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 (($?!=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]
- --with-linux=DIR Linux kernel source directory [$LINUX]
- --with-mkisofs=PATH position 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]
+@@ -1343,21 +1327,19 @@
+ #endif
+ }
+ EOF
+- for q in $QT4DIR; do
+- INCQT4="$q/include $q/include/QtCore"
+- FLGQT4="-DQT_SHARED"
+- I_INCQT4=`prefix_I "$INCQT4"`
+- LIBQT4="-L$q/lib -lVBoxQtCore"
+- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
+- foundqt4=2
+- break;
+- fi
+- LIBQT4="-L$q/lib -lQtCore"
+- if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
+- foundqt4=1
+- break;
+- fi
+- done
++ INCQT4="/usr/include/qt4 /usr/include/qt/QtCore"
++ FLGQT4="-DQT_SHARED"
++ I_INCQT4=`prefix_I "$INCQT4"`
++ LIBQT4="-L/usr/lib/qt4 -lVBoxQtCore"
++ if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
++ foundqt4=2
++ break;
++ fi
++ LIBQT4="-L/usr/lib/qt4 -lQtCore"
++ if test_compile "$LIBQT4 $LIBPTHREAD $I_INCQT4 $FLGQT4" qt4 qt4 nofatal; then
++ foundqt4=1
++ break;
++ fi
+ fi
+ fi
+ if [ -n "$foundqt4" ]; then
+@@ -1393,21 +1375,19 @@
+ cnf_append "VBOX_WITH_QT4_SUN" "1"
+ fi
+ 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"
+- cnf_append "PATH_SDK_QT4" "$q"
+- cnf_append "PATH_TOOL_QT4" "$q"
+- return
+- fi
++ 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"
++ cnf_append "PATH_SDK_QT4" "$q"
++ cnf_append "PATH_TOOL_QT4" "$q"
++ return
+ fi
+- done
++ fi
+ fi
+ fi
+ else
+@@ -1765,8 +1745,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 Qt3 headers/libraries [$QT3DIR]
+- --with-qt4-dir=DIR directory for Qt4 headers/libraries [pkgconfig]
-@@ -970,9 +964,6 @@
- --with-kbuild=*)
- KBUILDDIR=`echo $option | cut -d'=' -f2`
+ Build type:
+ -d, --build-debug build with debugging symbols and assertions
+@@ -1809,13 +1787,6 @@
+ exit 1
+ fi
;;
- --with-qt-dir=*)
-- QTDIR=`echo $option | cut -d'=' -f2`
+- QT3DIR=`echo $option | cut -d'=' -f2`
+- ;;
+- --with-qt4-dir=*)
+- QT4DIR=`echo $option | cut -d'=' -f2`
+- QT4DIR_PKGCONFIG=0
- ;;
--with-iasl=*)
IASL=`echo $option | cut -d'=' -f2`
projects / packages / VirtualBox.git / blobdiff