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.

diff --git a/CHANGES b/CHANGES
index 3af3357..e9a6c9e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Yang Tse (14 Jul 2008)
+- 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.
+
 Yang Tse (11 Jul 2008)
 - Added missing multiple header inclusion prevention definition for header
   file content_encoding.h

diff --git a/docs/INSTALL b/docs/INSTALL
index 4b2928b..6b0fd03 100644 (file)
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -332,10 +332,12 @@ Win32
    CURL_DISABLE_DICT     disables DICT
    CURL_DISABLE_FILE     disables FILE
    CURL_DISABLE_TFTP     disables TFTP
+   CURL_DISABLE_HTTP     disables HTTP
 
    If you want to set any of these defines you have the following
    possibilities:
 
+   - Modify lib/config-win32.h
    - Modify lib/setup.h
    - Modify lib/Makefile.vc6
    - Add defines to Project/Settings/C/C++/General/Preprocessor Definitions

diff --git a/lib/setup.h b/lib/setup.h
index 1f8505d..dca6da4 100644 (file)
--- 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
  */
@@ -83,6 +74,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,
  * winsock2.h, ws2tcpip.h or winsock.h. Any other windows thing belongs