Changeset 20209 in vbox for trunk/configure

Timestamp:

Jun 3, 2009 7:48:35 AM (16 years ago)

Author:

vboxsync

Message:

configure: freebsd fix

File:

• trunk/configure (modified) (8 diffs)

trunk/configure

@@ -44 +44 @@
 }
 
+OS=`uname -s | sed -e 's/GNU\/Linux/Linux/g' | tr [:upper:] [:lower:]`
+case "$OS" in
+  linux)
+    ;;
+  darwin)
+    ;;
+  freebsd)
+    ;;
+  sunos)
+    OS='solaris'
+    ;;
+  *)
+    echo "Cannot determine OS!"
+    exit 1
+    ;;
+esac
 
 #
@@ -70 +86 @@
 WITH_OPENGL=1
 WITH_HARDENING=1
+BUILD_LIBXML2=
+BUILD_LIBXSLT=
+BUILD_LIBCURL=
 CC="gcc"
 CC32=""
@@ -83 +102 @@
 GENISOIMAGE="genisoimage"
 MKISOFS="mkisofs"
-BUILD_LIBXML2=
-BUILD_LIBXSLT=
-BUILD_LIBCURL=
 LIBCRYPTO="-lcrypto"
 LIBPTHREAD="-lpthread"
@@ -91 +107 @@
 GSOAP=""
 GSOAP_IMPORT=""
+INCX11="/usr/local/include"
 LIBX11="-L/usr/X11R6/lib -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11"
-INCX11="/usr/local/include"
 LIBXCURSOR="-lXcursor"
 LIBXMU="-lXmu"
@@ -100 +116 @@
 INCPNG=""
 LIBPNG="-lpng"
-INCCURL=""
-LIBCURL="-lcurl"
+if [ "$OS" = "freebsd" ]; then
+  INCCURL="-I/usr/local/include"
+  LIBCURL="-L/usr/local/lib -lcurl"
+else
+  INCCURL=""
+  LIBCURL="-lcurl"
+fi
 PKGCONFIG="`which_wrapper pkg-config`"
 PYTHONDIR="/usr /usr/local"
@@ -128 +149 @@
 
 # darwin /bin/sh has a builtin echo that doesn't grok -n. gotta love it.
-if [ "`uname`" = "Darwin" ]; then
+if [ "$OS" = "darwin" ]; then
   ECHO_N="/bin/echo -n"
 else
@@ -290 +311 @@
 {
   test_header environment
-  OS=`uname -s | sed -e 's/GNU\/Linux/Linux/g' | tr [:upper:] [:lower:]`
-  case "$OS" in
-    linux)
-      ;;
-    darwin)
-      ;;
-    freebsd)
-      ;;
-    sunos)
-      OS='solaris'
-      ;;
-    *)
-      log_failure "Cannot determine OS"
-      exit 1
-      ;;
-  esac
   BUILD_CPU=`uname -m`
   [ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
@@ -378 +383 @@
         log_failure "gcc version $cc_ver does not match g++ version $cxx_ver"
         fail really
-      elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "OS" = "darwin" ]; then
+      elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then
         log_success "found version $cc_ver"
       elif [ $cc_maj -eq 4 -a $cc_min -eq 4 ]; then