diff options
| author | Don <don.j.olmstead@gmail.com> | 2021-08-20 09:29:10 -0700 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-08-21 15:44:17 +0200 |
| commit | 4886962fb14382e8f4dd20c38a3cbc5c6f0f4f1b (patch) | |
| tree | 457b75493df4ed0edfea3aa94b7398cbe127eb76 | |
| parent | 37f1c21cb9c809ec870803fc40e1ed2afd9534ac (diff) | |
| download | curl-4886962fb14382e8f4dd20c38a3cbc5c6f0f4f1b.tar.gz | |
curl_setup.h: sync values for HTTP_ONLY
The values for HTTP_ONLY differed between CMakeLists.txt and
curl_setup.h. Sync them and sort the values in curl_setup.h to make it
easier to spot differences.
Closes #7601
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/curl_setup.h | 40 |
2 files changed, 24 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c85295e11..587478217 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,6 +194,7 @@ mark_as_advanced(CURL_DISABLE_MQTT) option(CURL_ENABLE_EXPORT_TARGET "to enable cmake export target" ON) mark_as_advanced(CURL_ENABLE_EXPORT_TARGET) +# Corresponds to HTTP_ONLY in lib/curl_setup.h if(HTTP_ONLY) set(CURL_DISABLE_DICT ON) set(CURL_DISABLE_FILE ON) diff --git a/lib/curl_setup.h b/lib/curl_setup.h index c0861d79b..99048c489 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -166,41 +166,47 @@ */ #ifdef HTTP_ONLY -# ifndef CURL_DISABLE_TFTP -# define CURL_DISABLE_TFTP +# ifndef CURL_DISABLE_DICT +# define CURL_DISABLE_DICT +# endif +# ifndef CURL_DISABLE_FILE +# define CURL_DISABLE_FILE # endif # ifndef CURL_DISABLE_FTP # define CURL_DISABLE_FTP # endif +# ifndef CURL_DISABLE_GOPHER +# define CURL_DISABLE_GOPHER +# endif +# ifndef CURL_DISABLE_IMAP +# define CURL_DISABLE_IMAP +# endif # ifndef CURL_DISABLE_LDAP # define CURL_DISABLE_LDAP # endif -# ifndef CURL_DISABLE_TELNET -# define CURL_DISABLE_TELNET +# ifndef CURL_DISABLE_LDAPS +# define CURL_DISABLE_LDAPS # endif -# ifndef CURL_DISABLE_DICT -# define CURL_DISABLE_DICT +# ifndef CURL_DISABLE_MQTT +# define CURL_DISABLE_MQTT # endif -# ifndef CURL_DISABLE_FILE -# define CURL_DISABLE_FILE +# ifndef CURL_DISABLE_POP3 +# define CURL_DISABLE_POP3 # endif # ifndef CURL_DISABLE_RTSP # define CURL_DISABLE_RTSP # endif -# ifndef CURL_DISABLE_POP3 -# define CURL_DISABLE_POP3 -# endif -# ifndef CURL_DISABLE_IMAP -# define CURL_DISABLE_IMAP +# ifndef CURL_DISABLE_SMB +# define CURL_DISABLE_SMB # endif # ifndef CURL_DISABLE_SMTP # define CURL_DISABLE_SMTP # endif -# ifndef CURL_DISABLE_GOPHER -# define CURL_DISABLE_GOPHER +# ifndef CURL_DISABLE_TELNET +# define CURL_DISABLE_TELNET # endif -# ifndef CURL_DISABLE_SMB -# define CURL_DISABLE_SMB +# ifndef CURL_DISABLE_TFTP +# define CURL_DISABLE_TFTP # endif #endif |