---- configure.orig 2007-10-24 14:29:21.000000000 +0200
-+++ configure 2007-10-24 14:29:29.000000000 +0200
-@@ -64,7 +64,6 @@
+--- 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"
--QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
+-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
-@@ -189,8 +188,8 @@
+@@ -207,8 +204,8 @@
echo "compiling the following source file:" >> $LOG
cat .tmp_src.cc >> $LOG
echo "using the following command line:" >> $LOG
if [ $? -ne 0 ]; then
if [ -z "$4" ]; then
echo
-@@ -978,37 +977,26 @@
+@@ -1181,37 +1178,25 @@
}
EOF
found_qt=0
- libs="lib"
- [ "$LIB" = "lib64" ] && libs="$libs lib64"
-- for q in $QTDIR; do
+- for q in $QT3DIR; do
- for l in $libs; do
- echo "compiling the following source file:" >> $LOG
- cat .tmp_src.cc >> $LOG
+ 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 " 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 [ $? -ne 0 ]; then
log_failure "not found"
fail
-@@ -1226,7 +1214,6 @@
+@@ -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]
--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-xalan-incdir=DIR location of the xalan headers [/usr/include /usr/local/include]
- --with-xalan-libdir=DIR location of the xalan library [/usr/lib /usr/local/lib]
-@@ -1268,9 +1255,6 @@
+- --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 @@
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`
- ;;
--with-iasl=*)
IASL=`echo $option | cut -d'=' -f2`
---- VirtualBox-1.5.4_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk 2007-12-30 17:02:00.000000000 +0000
-+++ VirtualBox-1.5.4_OSE/src/VBox/Additions/linux/xclient/Makefile.kmk 2007-12-30 17:05:37.000000000 +0000
-@@ -32,10 +32,10 @@
- vboxadd-xclient_DEFS = _GNU_SOURCE VBOX_HGCM
-
- # link agaginst libstdc++.a (http://www.trilithium.com/johan/2005/06/static-libstdc/)
--$(PATH_TARGET)/vboxadd-xclient/vboxadd-xclient: $(PATH_TARGET)/vboxadd-xclient/libstdc++.a
-+#$(PATH_TARGET)/vboxadd-xclient/vboxadd-xclient: $(PATH_TARGET)/vboxadd-xclient/libstdc++.a
-
--$(PATH_TARGET)/vboxadd-xclient/libstdc++.a:
+--- VirtualBox-1.6.0_OSE/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-04-30 16:05:59.000000000 +0200
++++ VirtualBox-1.6.0_OSE/src/VBox/Additions/x11/xclient/Makefile.kmk 2008-05-05 09:42:04.000000000 +0200
+@@ -63,14 +63,14 @@
+ # Link aginst libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/).
+ # (It would've been preferred to avoid features depending on libstdc++, of course...)
+ #
+-VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient
+-VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a
+-VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a
+-$(PATH_TARGET)/VBoxClient/libstdc++.a:
- $(call MSG_L1,Forcing static libstdc++)
-- $(QUIET)ln -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
-+#$(PATH_TARGET)/vboxadd-xclient/libstdc++.a:
+- $(QUIET)$(MKDIR) -p $(@D)
+- $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ \
+- || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
++#VBoxClient_LIBPATH += $(PATH_TARGET)/VBoxClient
++#VBoxClient_ORDERDEPS = $(PATH_TARGET)/VBoxClient/libstdc++.a
++#VBoxClient_CLEAN = $(PATH_TARGET)/VBoxClient/libstdc++.a
++#$(PATH_TARGET)/VBoxClient/libstdc++.a:
+# $(call MSG_L1,Forcing static libstdc++)
-+# $(QUIET)ln -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ || cp `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
++# $(QUIET)$(MKDIR) -p $(@D)
++# $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@ \
++# || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC32_TOOL)_CXX) -print-file-name=libstdc++.a` $@
+
- include $(PATH_KBUILD)/footer.kmk
+ ifdef VBOX_X11_SEAMLESS_GUEST
projects / packages / VirtualBox.git / commitdiff