HTTP_ONLY definition check in lib/setup.h is now done once that configuration

file has been included. In this way if symbol is defined in the config file
it will no longer be ignored.
This commit is contained in:
Yang Tse
2008-07-14 12:39:50 +00:00
parent da6fa34f02
commit fe7bb33af8
3 changed files with 20 additions and 9 deletions

View File

@@ -23,15 +23,6 @@
* $Id$
***************************************************************************/
#ifdef HTTP_ONLY
#define CURL_DISABLE_TFTP
#define CURL_DISABLE_FTP
#define CURL_DISABLE_LDAP
#define CURL_DISABLE_TELNET
#define CURL_DISABLE_DICT
#define CURL_DISABLE_FILE
#endif /* HTTP_ONLY */
/*
* Define WIN32 when build target is Win32 API
*/
@@ -82,6 +73,19 @@
#endif /* HAVE_CONFIG_H */
/*
* Disable other protocols when http is the only one desired.
*/
#ifdef HTTP_ONLY
# define CURL_DISABLE_TFTP
# define CURL_DISABLE_FTP
# define CURL_DISABLE_LDAP
# define CURL_DISABLE_TELNET
# define CURL_DISABLE_DICT
# define CURL_DISABLE_FILE
#endif
/*
* Include header files for windows builds before redefining anything.
* Use this preproessor block only to include or exclude windows.h,