From fe7bb33af8d8b4e0ede43b4fa1caf7d8b00c7966 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Mon, 14 Jul 2008 12:39:50 +0000
Subject: 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.

---
 lib/setup.h | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/setup.h b/lib/setup.h
index 1f8505d13..dca6da42d 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -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,
-- 
cgit v1.2.3