Changeset 2571 in vbox

Timestamp:

May 9, 2007 8:23:34 PM (18 years ago)

Author:

vboxsync

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

21040

Message:

on 64bit systems, 64bit libs are located in *lib64, not *lib, see ​http://www.pathname.com/fhs/pub/fhs-2.3.html#LIB64

File:

• trunk/configure (modified) (3 diffs)

trunk/configure

@@ -195 +195 @@
     i[3456789]86|x86)
       MACHINE='x86'
+      LIB='lib'
       ;;
     x86_64|amd64)
       MACHINE='amd64'
       CPU='k8'
-
+      # on AMD64 systems, 64bit libs are usually located in /usr/lib64
+      # see http://www.pathname.com/fhs/pub/fhs-2.3.html#LIB64
+      LIB='lib64'
       echo ""
       echo ""
@@ -501 +504 @@
       log_success "found version $libidl_ver"
       cnf_append "VBOX_LIBIDL_CONFIG" \
-        "PKG_CONFIG_PATH=`libIDL-config-2 --prefix`/lib/pkgconfig `which_wrapper libIDL-config-2`"
+        "PKG_CONFIG_PATH=`libIDL-config-2 --prefix`/$LIB/pkgconfig `which_wrapper libIDL-config-2`"
     fi
   elif check_avail "libIDL-config" libIDL-config; then
@@ -863 +866 @@
     cat .tmp_src.cc >> $LOG
     echo "using the following command line:" >> $LOG
-    if [ "$MACHINE" = "amd64" ]; then
-      echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib64 -L$q/lib -lqt-mt" >> $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/lib64 -L$q/lib -lqt-mt >> $LOG 2>&1
-    else
-      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
-    fi
+    $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