Changeset 9319 in vbox

Timestamp:

Jun 2, 2008 8:00:08 PM (16 years ago)

Author:

vboxsync

Message:

openssl 0.9.8h, next try

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1341 +1341 @@
 
 SDK_VBOX_OPENSSL      = .
-#if1of ($(KBUILD_TARGET),linux solaris)
-#SDK_VBOX_OPENSSL_INCS?= $(PATH_ROOT)/src/libs/openssl-0.9.8h/include
-#else
+if1of ($(KBUILD_TARGET),linux)
+SDK_VBOX_OPENSSL_INCS?= $(PATH_ROOT)/src/libs/openssl-0.9.8h/include
+else
 SDK_VBOX_OPENSSL_INCS?= $(PATH_ROOT)/src/libs/openssl-0.9.7e/include
-#endif
+endif
 SDK_VBOX_OPENSSL_LIBS?= $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB)
 

trunk/src/libs/Makefile.kmk

@@ -39 +39 @@
 #endif # !VBOX_OSE
 ifdef VBOX_WITH_VRDP
-# ifeq ($(SDK_VBOX_OPENSSL_INCS),$(PATH_ROOT)/src/libs/openssl-0.9.8h/include)
+ if1of ($(KBUILD_TARGET),linux)
+  ifeq ($(SDK_VBOX_OPENSSL_INCS),$(PATH_ROOT)/src/libs/openssl-0.9.8h/include)
+   subdirs += openssl-0.9.8h
+  endif
+ else
  ifeq ($(SDK_VBOX_OPENSSL_INCS),$(PATH_ROOT)/src/libs/openssl-0.9.7e/include)
-#  if1of ($(KBUILD_TARGET),linux solaris)
-#   subdirs += openssl-0.9.8h
-#  else
    subdirs += openssl-0.9.7e
-#  endif
+  endif
  endif
 endif