diff --git a/android/build_boinc_armv6.sh b/android/build_boinc_armv6.sh
index ccac80eece..cbf974e1d4 100755
--- a/android/build_boinc_armv6.sh
+++ b/android/build_boinc_armv6.sh
@@ -69,7 +69,7 @@ if [ -n "$COMPILEBOINC" ]; then
     fi
     if [ -n "$CONFIGURE" ]; then
         ./_autosetup
-        if [ $BUILD_WITH_VCPKG = "yes" ]; then
+        if [ $BUILD_APPS_WITH_VCPKG = "yes" ]; then
             export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
         fi
         ./configure --host=armv6-linux --with-boinc-platform="arm-android-linux-gnu" $CONFIG_FLAGS --disable-server --disable-manager --disable-shared --enable-static --disable-largefile
diff --git a/android/build_example_arm64.sh b/android/build_example_arm64.sh
index 82543af6af..87c8fbda87 100755
--- a/android/build_example_arm64.sh
+++ b/android/build_example_arm64.sh
@@ -40,12 +40,6 @@ export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -DANDROID_64 -Wall  -funroll-loo
 export LDFLAGS="$CONFIG_LDFLAGS -L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie -latomic -static-libstdc++ -lz"
 export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
 
-ENABLE_VCPKG_FLAG=""
-
-if [ $BUILD_WITH_VCPKG = "yes" ]; then
-    ENABLE_VCPKG_FLAG="--enable-vcpkg"
-fi
-
 MAKE_FLAGS=""
 
 if [ $VERBOSE = "no" ]; then
diff --git a/android/build_example_armv6.sh b/android/build_example_armv6.sh
index 74d1137954..57192632a4 100755
--- a/android/build_example_armv6.sh
+++ b/android/build_example_armv6.sh
@@ -39,12 +39,6 @@ export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -Wall  -funroll-loops -fexceptio
 export LDFLAGS="$CONFIG_LDFLAGS -L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie -latomic -static-libstdc++ -march=armv6"
 export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
 
-ENABLE_VCPKG_FLAG=""
-
-if [ $BUILD_WITH_VCPKG = "yes" ]; then
-    ENABLE_VCPKG_FLAG="--enable-vcpkg"
-fi
-
 MAKE_FLAGS=""
 
 if [ $VERBOSE = "no" ]; then
diff --git a/android/build_example_x86_64.sh b/android/build_example_x86_64.sh
index 7a9a8074f1..20894238c3 100755
--- a/android/build_example_x86_64.sh
+++ b/android/build_example_x86_64.sh
@@ -40,12 +40,6 @@ export CXXFLAGS="--sysroot=$TCSYSROOT -DANDROID -DANDROID_64 -Wall  -funroll-loo
 export LDFLAGS="$CONFIG_LDFLAGS -L$TCSYSROOT/usr/lib -L$TCINCLUDES/lib -llog -fPIE -pie -latomic -static-libstdc++ -lz"
 export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
 
-ENABLE_VCPKG_FLAG=""
-
-if [ $BUILD_WITH_VCPKG = "yes" ]; then
-    ENABLE_VCPKG_FLAG="--enable-vcpkg"
-fi
-
 MAKE_FLAGS=""
 
 if [ $VERBOSE = "no" ]; then
diff --git a/configure.ac b/configure.ac
index db0301c27a..35646768f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1128,7 +1128,7 @@ AM_CONDITIONAL(OS_ARM_LINUX, [echo $host_alias | grep '^arm-linux' > /dev/null])
 AM_CONDITIONAL(OS_ARMV6_LINUX, [echo $host_alias | grep '^armv6-linux' > /dev/null])
 AM_CONDITIONAL(ANDROID, [test x"${ANDROID}" = xyes])
 
-AM_CONDITIONAL(BUILD_WITH_VCPKG, [test "${enable_apps_vcpkg}" = yes])
+AM_CONDITIONAL(BUILD_APPS_WITH_VCPKG, [test "${enable_apps_vcpkg}" = yes])
 AM_CONDITIONAL(BUILD_WITH_VBOX, [test "${enable_apps_vbox}" = yes])
 AM_CONDITIONAL(BUILD_WITH_MINGW, [test "${enable_apps_mingw}" = yes])
 AM_CONDITIONAL(BUILD_WITH_GUI, [test "${enable_apps_gui}" = yes])
diff --git a/samples/Makefile.am b/samples/Makefile.am
index f6d56f215b..f55780c1df 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -14,8 +14,8 @@ if BUILD_WITH_GUI
     export BUILD_WITH_GUI="yes"
 endif
 
-if BUILD_WITH_VCPKG
-    export BUILD_WITH_VCPKG="yes"
+if BUILD_APPS_WITH_VCPKG
+    export BUILD_APPS_WITH_VCPKG="yes"
 endif
 
 ## list the apps that should be build
@@ -26,7 +26,7 @@ if BUILD_WITH_VBOX
     SUBDIRS += vboxmonitor vboxwrapper
 endif
 
-if BUILD_WITH_VCPKG
+if BUILD_APPS_WITH_VCPKG
     SUBDIRS += wrappture
 endif
 
diff --git a/samples/condor/Makefile b/samples/condor/Makefile
index c0cae03cac..13153102df 100644
--- a/samples/condor/Makefile
+++ b/samples/condor/Makefile
@@ -30,7 +30,7 @@ CXXFLAGS += \
     -L$(BOINC_ZIP_DIR)
 
 
-ifdef BUILD_WITH_VCPKG
+ifdef BUILD_APPS_WITH_VCPKG
   BUILD_DIR     = $(BOINC_DIR)/3rdParty/linux
   VCPKG_DIR     ?= $(BUILD_DIR)/vcpkg/installed/x64-linux
 
diff --git a/samples/example_app/Makefile b/samples/example_app/Makefile
index 498bc2d6a1..f5d0f37489 100644
--- a/samples/example_app/Makefile
+++ b/samples/example_app/Makefile
@@ -47,7 +47,7 @@ LIBUI = -lX11 -lXmu
 LIBFTGL = -lftgl
 LIBJPEG = -ljpeg
 
-ifdef BUILD_WITH_VCPKG
+ifdef BUILD_APPS_WITH_VCPKG
   BUILD_DIR     = $(BOINC_DIR)/3rdParty/linux
   VCPKG_DIR     ?= $(BUILD_DIR)/vcpkg/installed/x64-linux
 
diff --git a/samples/sporadic/Makefile b/samples/sporadic/Makefile
index 74dc8fc8d9..5473bd3a6c 100644
--- a/samples/sporadic/Makefile
+++ b/samples/sporadic/Makefile
@@ -30,7 +30,7 @@ CXXFLAGS += -g \
     -L$(BOINC_LIB_DIR) \
     -L.
 
-ifdef BUILD_WITH_VCPKG
+ifdef BUILD_APPS_WITH_VCPKG
   BUILD_DIR     = $(BOINC_DIR)/3rdParty/linux
   VCPKG_DIR     ?= $(BUILD_DIR)/vcpkg/installed/x64-linux
 
diff --git a/wasm/ci_configure_client.sh b/wasm/ci_configure_client.sh
index aac6887421..1da06a3c6c 100755
--- a/wasm/ci_configure_client.sh
+++ b/wasm/ci_configure_client.sh
@@ -25,4 +25,4 @@ if [ "debug" == "$1" ]; then
 fi
 
 export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
-emconfigure ./configure $debug_flags --enable-wasm --enable-vcpkg --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --disable-server --enable-client --disable-manager
+emconfigure ./configure $debug_flags --enable-wasm --with-libcurl=$VCPKG_DIR --with-ssl=$VCPKG_DIR --disable-server --enable-client --disable-manager