Changeset 802 in vbox

Timestamp:

Feb 9, 2007 9:43:26 AM (18 years ago)

Author:

vboxsync

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

18475

Message:

added some extra paths to configure for exotic distributions

File:

• trunk/configure (modified) (14 diffs)

trunk/configure

@@ -52 +52 @@
 INCPNG=""
 LIBPNG="-lpng"
-QTDIR="/usr/qt/3 /usr/share/qt3"
+QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/share/qt3"
 KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
 DEVDIR="`cd $(dirname $0); pwd`/tools"
@@ -105 +105 @@
 }
 
-# Wrapper for ancient /usr/bin/which on darwin that always returns 0.
+# Wrapper for ancient /usr/bin/which on darwin that always returns 0
 function which_wrapper()
 {
@@ -116 +116 @@
   fi
   if [ "$have_ancient_which" = "yes" ]; then
-    local retval=`which $*`
+    local retval=`which $* 2>/dev/null`
     echo "$retval"
-    test -e "$retval"
+    test -n "$retval" -a -e "$retval"
   else
-    which $*
+    which $* 2> /dev/null
   fi
 }
@@ -139 +139 @@
 }
 
-#
 # Prepare a test
-#
 function test_header()
 {
@@ -148 +146 @@
 }
 
-#
 # Compile a test
-#
 function test_compile()
 {
@@ -294 +290 @@
 ' > .tmp_src.c
       cat .tmp_src.c >> $LOG
-      local bcc_path=`which $BCC`
+      local bcc_path=`which_wrapper $BCC`
       local bcc_dir="`dirname $bcc_path`/"
       echo "using the following command line:" >> $LOG
@@ -323 +319 @@
     else
       log_success "found version $as86_ver"
-      cnf_append "VBOX_AS86" "`which $AS86`"
+      cnf_append "VBOX_AS86" "`which_wrapper $AS86`"
     fi
   fi
@@ -367 +363 @@
     else
       log_success "found version $iasl_ver"
-      cnf_append "VBOX_IASLCMD" "`which $IASL`"
+      cnf_append "VBOX_IASLCMD" "`which_wrapper $IASL`"
     fi
   fi
@@ -385 +381 @@
     else
       log_success "found"
-      cnf_append "VBOX_XSLTPROC" "`which $XSLTPROC`"
+      cnf_append "VBOX_XSLTPROC" "`which_wrapper $XSLTPROC`"
     fi
   fi
@@ -396 +392 @@
 {
   test_header mkisofs
-  if which $GENISOIMAGE > /dev/null; then
+  if which_wrapper $GENISOIMAGE > /dev/null; then
     mkisofs_ver=`$GENISOIMAGE --version`
     if (($?!=0)); then
@@ -403 +399 @@
     else
       log_success "found $mkisofs_ver"
-      cnf_append "VBOX_MKISOFS" "`which $GENISOIMAGE`"
+      cnf_append "VBOX_MKISOFS" "`which_wrapper $GENISOIMAGE`"
     fi
   elif check_avail "$MKISOFS" MKISOFS; then
@@ -412 +408 @@
     else
       log_success "found $mkisofs_ver"
-      cnf_append "VBOX_MKISOFS" "`which $MKISOFS`"
+      cnf_append "VBOX_MKISOFS" "`which_wrapper $MKISOFS`"
     fi
   fi
@@ -484 +480 @@
   test_header libIDL
 
-  if which "libIDL-config-2" > /dev/null; then
+  if which_wrapper libIDL-config-2 > /dev/null; then
     libidl_ver=`libIDL-config-2 --version`
     if (($?!=0)); then
@@ -1127 +1123 @@
 echo "$PATH" | grep -q "$DEVDIR_BIN" || PATH="$PATH:$DEVDIR_BIN"
 
+# append some extra paths
+PATH="$PATH:/opt/gnome/bin"
+
 # the tools
 check_gcc