Changeset 22259 in vbox

Timestamp:

Aug 14, 2009 1:42:10 PM (15 years ago)

Author:

vboxsync

Message:

Configure-OSE: make it work for Darwin again

File:

• trunk/configure (modified) (8 diffs)

trunk/configure

@@ -89 +89 @@
 BUILD_LIBXSLT=
 BUILD_LIBCURL=
+BUILD_LIBSSL=
 CC="gcc"
 CC32=""
@@ -809 +810 @@
 check_ssl()
 {
-  test_header ssl
-  cat > $ODIR.tmp_src.cc << EOF
+  if [ -z "$BUILD_LIBSSL" ]; then
+    test_header ssl
+    cat > $ODIR.tmp_src.cc << EOF
 #include <cstdio>
 #include <openssl/opensslv.h>
@@ -825 +827 @@
 }
 EOF
-  if test_compile $LIBCRYPTO libcrypto openssl; then
-    if test_execute nofatal; then
-      cnf_append "SDK_VBOX_OPENSSL_INCS" ""
-      cnf_append "SDK_VBOX_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
+    if test_compile $LIBCRYPTO libcrypto openssl; then
+      if test_execute nofatal; then
+        cnf_append "SDK_VBOX_OPENSSL_INCS" ""
+        cnf_append "SDK_VBOX_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
+      fi
     fi
   fi
@@ -1836 +1839 @@
   darwin_ver=`uname -r`
   case "$darwin_ver" in
+    10\.*)
+      darwin_ver="10.6"
+      ;;
     9\.*)
       darwin_ver="10.5"
@@ -1844 +1850 @@
       ;;
     *)
-      echo "  failed to determin darwin version. (uname -r: $darwin_ver)"
+      echo "  failed to determine Darwin version. (uname -r: $darwin_ver)"
       fail
       darwin_ver="unknown"
@@ -2160 +2166 @@
   BUILD_LIBXSLT=1
   BUILD_LIBXML2=1
-  [ $OSE -eq 1 ] && BUILD_LIBCURL=1
+  [ $OSE -eq 1 ] || BUILD_LIBCURL=1
+  [ $OSE -eq 1 ] || BUILD_LIBSSL=1
 fi
 
@@ -2186 +2193 @@
 [ $WITH_XPCOM  -eq 1 ] && check_libxslt
 [ $WITH_LIBIDL -eq 1 ] && check_libidl
-# build openssl on Darwin in every case
-[ "$OS" != "darwin"  ] && check_ssl
+check_ssl
+check_curl
 [ "$OS" != "darwin"  ] && check_z
 [ "$OS" != "darwin" -a "$OS" != "freebsd" ] && check_png
-check_curl
 [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
 [ $WITH_SDL -eq 1 ]    && check_sdl
@@ -2246 +2252 @@
 if [ "$OS" = "darwin" ]; then
   check_darwinversion
-  check_i386elfgcc
+#  check_i386elfgcc
 fi