Changeset 1025 in vbox

Timestamp:

Feb 22, 2007 1:00:30 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18882

Message:

configure: tighten ALSA dependency to 1.0.6 as found on rhel4; added qt path of rhel4; --disable-xpcom now only disables xerces and xalan (old behavior for darwin)

File:

• trunk/configure (modified) (7 diffs)

trunk/configure

@@ -23 +23 @@
 
 #
-# Default positions
+# Defaults
 #
 OSE=1
-XPCOM=1
+WITH_XPCOM=1
+WITH_LIBIDL=1
+WITH_QT=1
 CC="gcc"
 CXX="g++"
@@ -52 +54 @@
 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"
 KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
 DEVDIR="`cd $(dirname $0); pwd`/tools"
@@ -226 +228 @@
 
   # Automatically disable XPCOM on darwin.
-  if [ "$OS" = "darwin" -a $XPCOM -eq 1 ]; then
-    XPCOM=0
+  if [ "$OS" = "darwin" -a $WITH_XPCOM -eq 1 ]; then
+    WITH_XPCOM=0
+    WITH_LIBIDL=0
+    WITH_QT=0
     echo "Disabling checks for XPCOM related components."
   fi
@@ -785 +789 @@
   printf("found version %d.%d.%d",
          SND_LIB_MAJOR, SND_LIB_MINOR, SND_LIB_SUBMINOR);
-#if 10000*SND_LIB_MAJOR + 100*SND_LIB_MINOR + SND_LIB_SUBMINOR >= 10008
+#if 10000*SND_LIB_MAJOR + 100*SND_LIB_MINOR + SND_LIB_SUBMINOR >= 10006
   printf(", OK.\n");
   return 0;
 #else
-  printf(", expected version 1.0.8 or higher\n");
+  printf(", expected version 1.0.6 or higher\n");
   return 1;
 #endif
@@ -1085 +1089 @@
       ;;
     --disable-xpcom)
-      XPCOM=0
+      WITH_XPCOM=0
       ;;
     --disable-qt)
@@ -1186 +1190 @@
 
 # the libraries
-(($XPCOM==1)) && check_xalan
-(($XPCOM==1)) && check_xerces
-(($XPCOM==1)) && check_libidl
+(($WITH_XPCOM==1)) && check_xalan
+(($WITH_XPCOM==1)) && check_xerces
+(($WITH_LIBIDL==1)) && check_libidl
 [ "$OS" != "darwin" ] && check_uuid
 (($OSE==0)) && check_ssl
@@ -1200 +1204 @@
 [ "$OS" != "darwin" ] && check_x
 [ "$OS" != "darwin" ] && check_xcursor
-(($XPCOM==1)) && check_qt
+(($WITH_QT==1)) && check_qt
 
 # Linux-specific