Changeset 85143 in vbox

Timestamp:

Jul 9, 2020 9:16:23 AM (5 years ago)

Author:

vboxsync

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

139089

Message:

Attempt to fix oem2 build.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/Makefile.kmk (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (2 diffs)
• Main/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -33 +33 @@
         $(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
         $(if $(VBOX_WITH_CLOUD_NET), VBOX_WITH_CLOUD_NET) \
+        $(if $(VBOX_WITH_LIBCURL), VBOX_WITH_PROXY_INFO) \
         $(if $(VBOX_WITH_AUDIO_OSS), VBOX_WITH_AUDIO_OSS) \
         $(if $(VBOX_WITH_AUDIO_ALSA), VBOX_WITH_AUDIO_ALSA) \

trunk/src/VBox/Frontends/VBoxManage/VBoxManageCloud.cpp

@@ -2110 +2110 @@
 static bool getSystemProxyForUrl(const com::Utf8Str &strUrl, Bstr &strProxy)
 {
+#ifndef VBOX_WITH_PROXY_INFO
+    LogRel(("OCI-NET: Proxy support is disabled. Using direct connection.\n"));
+    return false;
+#else /* VBOX_WITH_PROXY_INFO */
     RTHTTP hHttp;
     int rc = RTHttpCreate(&hHttp);
@@ -2158 +2162 @@
     RTHttpDestroy(hHttp);
     return true;
+#endif /* VBOX_WITH_PROXY_INFO */
 }
 

trunk/src/VBox/Main/Makefile.kmk

@@ -879 +879 @@
         $(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
         $(if $(VBOX_WITH_VRDEAUTH_IN_VBOXSVC),VBOX_WITH_VRDEAUTH_IN_VBOXSVC,) \
+        $(if $(VBOX_WITH_LIBCURL), VBOX_WITH_PROXY_INFO) \
         $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,)
 ifdef VBOX_WITH_NETSHAPER