base64: also build for curl

Since the tool itself now uses the base64 code using the curlx way, it
needs to build also when the tool needs it. Starting now, the tool build
defines BULDING_CURL to allow lib-side code to use it.

Follow-up to 2e160c9c6525

Closes #12010

diff --git a/lib/base64.c b/lib/base64.c
index 30db7e5889f5b264b07f8c04d8fac505ff5021d2..2a49b5acd6a5b6b77f4180cf93c222a857100ec3 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -31,7 +31,7 @@
   !defined(CURL_DISABLE_SMTP) || \
   !defined(CURL_DISABLE_POP3) || \
   !defined(CURL_DISABLE_IMAP) || \
-  !defined(CURL_DISABLE_DOH) || defined(USE_SSL)
+  !defined(CURL_DISABLE_DOH) || defined(USE_SSL) || defined(BUILDING_CURL)
 #include "curl/curl.h"
 #include "warnless.h"
 #include "curl_base64.h"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6517c703633f9b62d9c1c284a6ba37563df223c..a3c4218eaff93c015be3a2af8138be2a1500b2ca 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,7 @@
 #
 ###########################################################################
 set(EXE_NAME curl)
+add_definitions(-DBUILDING_CURL)
 
 if(USE_MANUAL)
   # Use the C locale to ensure that only ASCII characters appear in the

diff --git a/src/Makefile.am b/src/Makefile.am
index ed2df5ef5714e068cc4821ee5a65d8493e0a32f6..ddeb70073af55e26d99798696794b6a7f27e0ea6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,6 +50,7 @@ SUBDIRS = ../docs
 if USE_CPPFLAG_CURL_STATICLIB
 AM_CPPFLAGS += -DCURL_STATICLIB
 endif
+AM_CPPFLAGS += -DBUILDING_CURL
 
 include Makefile.inc