-#ifndef _CONFIG_H
-#define _CONFIG_H
+#ifndef CONFIG_H_INCLUDED
+#define CONFIG_H_INCLUDED
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/acconfig.h,v $
*
* Revisions :
* $Log: acconfig.h,v $
+ * Revision 1.9 2001/07/29 19:08:52 jongfoster
+ * Changing _CONFIG_H to CONFIG_H_INCLUDED.
+ * Also added protection against using a MinGW32 or CygWin version of
+ * config.h from within MS Visual C++
+ *
+ * Revision 1.8 2001/07/29 17:09:17 jongfoster
+ * Major changes to build system in order to fix these bugs:
+ * - pthreads under Linux was broken - changed -lpthread to -pthread
+ * - Compiling in MinGW32 mode under CygWin now correctly detects
+ * which shared libraries are available
+ * - Solaris support (?) (Not tested under Solaris yet)
+ *
* Revision 1.7 2001/07/25 22:53:59 jongfoster
* Will #error if pthreads is enabled under BeOs
*
#undef VERSION
/*
- * Status of the code: alpha, beta or stable
+ * Status of the code: "alpha", "beta" or "stable".
*/
#undef CODE_STATUS
#undef STATIC_PCRS
/*
- * Allow JunkBuster to be "disabled" so it is just a normal non-blocking
- * non-anonymizing proxy. This is useful if you're trying to access a
- * blocked or broken site - just change the setting in the config file
- * and send a SIGHUP (UN*X), or use the handy "Disable" menu option (Windows
- * GUI).
- */
-#undef TOGGLE
-
-/*
- * If a stream is compressed via gzip (Netscape specific I think), then
- * it cannot be modified with Perl regexps. This forces it to be
- * uncompressed.
+ * Allows the use of an ACL to control access to the proxy by IP address.
*/
-#undef DENY_GZIP
+#undef FEATURE_ACL
/*
- * Enables statistics function.
+ * Allows the use of jar files to capture cookies.
*/
-#undef STATISTICS
+#undef FEATURE_COOKIE_JAR
/*
- * Bypass filtering for 1 page only
+ * If a stream is compressed via gzip, then it cannot be filtered through
+ * the PCRE regexps. (Commonly happens with Netscape browsers).
+ * This forces it to be uncompressed.
*/
-#undef FORCE_LOAD
+#undef FEATURE_DENY_GZIP
/*
* Locally redirect remote script-redirect URLs
*/
-#undef FAST_REDIRECTS
+#undef FEATURE_FAST_REDIRECTS
/*
- * Split the show-proxy-args page into a page for each config file.
- */
-#undef SPLIT_PROXY_ARGS
-
-/*
- * Kills JavaScript popups - window.open, onunload, etc.
+ * Bypass filtering for 1 page only
*/
-#undef KILLPOPUPS
+#undef FEATURE_FORCE_LOAD
/*
- * Support for webDAV - e.g. so Microsoft Outlook can access HotMail e-mail
+ * Allow blocking using images as well as HTML.
+ * If you do not define this then everything is blocked as HTML.
+ *
+ * Note that this is required if you want to use FEATURE_IMAGE_DETECT_MSIE.
*/
-#undef WEBDAV
+#undef FEATURE_IMAGE_BLOCKING
/*
* Detect image requests automatically for MSIE. Will fall back to
* other image-detection methods (i.e. "+image" permission) for other
* browsers.
*
- * You must also define IMAGE_BLOCKING to use this feature.
+ * You must also define FEATURE_IMAGE_BLOCKING to use this feature.
*
* It detects the following header pair as an image request:
*
* These limitations are due to IE making inconsistent choices
* about which "Accept:" header to send.
*/
-#undef DETECT_MSIE_IMAGES
+#undef FEATURE_IMAGE_DETECT_MSIE
/*
- * Allow blocking using images as well as HTML.
- * If you do not define this then everything is blocked as HTML.
- *
- * Note that this is required if you want to use DETECT_MSIE_IMAGES.
- */
-#undef IMAGE_BLOCKING
-
-/*
- * Allows the use of ACL files to control access to the proxy by IP address.
+ * Kills JavaScript popups - window.open, onunload, etc.
*/
-#undef ACL_FILES
+#undef FEATURE_KILL_POPUPS
/*
- * Allows the use of trust files.
+ * Use POSIX threads instead of native threads.
*/
-#undef TRUST_FILES
+#undef FEATURE_PTHREAD
/*
- * Allows the use of jar files to capture cookies.
+ * Enables statistics function.
*/
-#undef JAR_FILES
+#undef FEATURE_STATISTICS
/*
- * Define this to use the Windows GUI for editing the blocklist.
- * FIXME: This feature is only partially implemented and does not work
- * FIXME: This #define can never be set by ./configure.
+ * Allow JunkBuster to be "disabled" so it is just a normal non-blocking
+ * non-anonymizing proxy. This is useful if you're trying to access a
+ * blocked or broken site - just change the setting in the config file,
+ * or use the handy "Disable" menu option in the Windows GUI.
*/
-#undef WIN_GUI_EDIT
+#undef FEATURE_TOGGLE
/*
- * Use POSIX threads instead of native threads.
+ * Allows the use of trust files.
*/
-#undef FEATURE_PTHREAD
+#undef FEATURE_TRUST
/*
* Defined on Solaris only. Makes the system libraries thread safe.
#endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */
-#endif /* _CONFIG_H */
+/*
+ * It's too easy to accidentally use a Cygwin or MinGW32 version of config.h
+ * under VC++, and it usually gives many wierd error messages. Let's make
+ * the error messages understandable, by bailing out now.
+ */
+#ifdef _MSC_VER
+#error For MS VC++, please use config.h.win or config.h.win32threads.win. You can usually do this by selecting the "Build", "Clean" menu option.
+#endif /* def _MSC_VER */
+
+#endif /* CONFIG_H_INCLUDED */