base64: drop `BUILDING_CURL` macro, always include in tests/server

Before this patch, building tests/server (or curl with winbuild) was
broken in rare builds when many features were explicitly disabled.

Fix it by enabling base64 functions unconditionally when building
for anything other than libcurl.

Closes #16691

diff --git a/lib/base64.c b/lib/base64.c
index 8957eaf4166abc8cabc929cd9402ceb527cac43b..3e819d23260bcfcb1af5510488512fce2918ac32 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -32,7 +32,7 @@
   !defined(CURL_DISABLE_POP3) || \
   !defined(CURL_DISABLE_IMAP) || \
   !defined(CURL_DISABLE_DIGEST_AUTH) || \
-  !defined(CURL_DISABLE_DOH) || defined(USE_SSL) || defined(BUILDING_CURL)
+  !defined(CURL_DISABLE_DOH) || defined(USE_SSL) || !defined(BUILDING_LIBCURL)
 #include "curl/curl.h"
 #include "warnless.h"
 #include "curl_base64.h"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e62d4f3543955925d02e96d1816bc430d1da871..d0d5980c3546712eae8088dc2926e8c830ff56f1 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,7 +22,6 @@
 #
 ###########################################################################
 set(EXE_NAME curl)
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "BUILDING_CURL")
 
 set(_curl_cfiles_gen "")
 set(_curl_hfiles_gen "")

diff --git a/src/Makefile.am b/src/Makefile.am
index f45920b16f4d60c610fda7bcd6a34a62320f04dc..a97b0bcbee2db3ddbe2990c00e0fb18d6bd493fe 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,6 @@ bin_PROGRAMS = curl
 if USE_CPPFLAG_CURL_STATICLIB
 AM_CPPFLAGS += -DCURL_STATICLIB
 endif
-AM_CPPFLAGS += -DBUILDING_CURL
 
 AM_LDFLAGS =
 if USE_UNICODE