X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=config.h.in;h=808bda7f841df8e30d3f61b15adedb2b3712bca2;hb=004d0cf61c498b0309f4b3b58818114fe3330a20;hp=503b25edd3e31b4c6ffd0c359734cab738cbbd58;hpb=b9718270c8a6eb01c336d7f0098d43914426275d;p=privoxy.git diff --git a/config.h.in b/config.h.in index 503b25ed..808bda7f 100644 --- a/config.h.in +++ b/config.h.in @@ -1,6 +1,6 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -#ifndef _CONFIG_H -#define _CONFIG_H +#ifndef CONFIG_H_INCLUDED +#define CONFIG_H_INCLUDED /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/acconfig.h,v $ @@ -38,6 +38,26 @@ * * Revisions : * $Log: acconfig.h,v $ + * Revision 1.14 2001/10/23 21:24:09 jongfoster + * Support for FEATURE_CGI_EDIT_ACTIONS + * + * Revision 1.13 2001/10/07 15:30:41 oes + * Removed FEATURE_DENY_GZIP + * + * Revision 1.12 2001/09/13 19:56:37 jongfoster + * Reverting to revision 1.10 - previous checking was majorly broken. + * + * Revision 1.10 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * + * 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 @@ -142,14 +162,6 @@ *********************************************************************/ -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define to `unsigned' if doesn't define. */ -#undef size_t - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS /* * Version number - Major (X._._) @@ -172,7 +184,7 @@ #undef VERSION /* - * Status of the code: alpha, beta or stable + * Status of the code: "alpha", "beta" or "stable". */ #undef CODE_STATUS @@ -201,57 +213,45 @@ #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. + * Enables the web-based configuration (actionsfile) editor. If you + * have a shared proxy, you might want to turn this off. */ -#undef STATISTICS +#undef FEATURE_CGI_EDIT_ACTIONS /* - * Bypass filtering for 1 page only + * Allows the use of jar files to capture cookies. */ -#undef FORCE_LOAD +#undef FEATURE_COOKIE_JAR /* * Locally redirect remote script-redirect URLs */ -#undef FAST_REDIRECTS - -/* - * Split the show-proxy-args page into a page for each config file. - */ -#undef SPLIT_PROXY_ARGS +#undef FEATURE_FAST_REDIRECTS /* - * 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: * @@ -276,35 +276,35 @@ * 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. + * Kills JavaScript popups - window.open, onunload, etc. */ -#undef IMAGE_BLOCKING +#undef FEATURE_KILL_POPUPS /* - * Allows the use of ACL files to control access to the proxy by IP address. + * Use POSIX threads instead of native threads. */ -#undef ACL_FILES +#undef FEATURE_PTHREAD /* - * Allows the use of trust files. + * Enables statistics function. */ -#undef TRUST_FILES +#undef FEATURE_STATISTICS /* - * Allows the use of jar files to capture cookies. + * 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 JAR_FILES +#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. @@ -324,15 +324,67 @@ */ #undef __MT__ -/* Define if you have the bcopy function. */ + +/* Define if you have the `bcopy' function. */ #undef HAVE_BCOPY -/* Define if you have the memmove function. */ +/* Define if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define if you have the `memmove' function. */ #undef HAVE_MEMMOVE -/* Define if you have the strerror function. */ +/* Define if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define if you have the `strerror' function. */ #undef HAVE_STRERROR +/* Define if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define if you have the header file. */ +#undef HAVE_STRING_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define if you have the header file. */ +#undef HAVE_UNISTD_H + +/* The size of a `char *', as computed by sizeof. */ +#undef SIZEOF_CHAR_P + +/* The size of a `int', as computed by sizeof. */ +#undef SIZEOF_INT + +/* The size of a `long', as computed by sizeof. */ +#undef SIZEOF_LONG + +/* The size of a `long long', as computed by sizeof. */ +#undef SIZEOF_LONG_LONG + +/* The size of a `size_t', as computed by sizeof. */ +#undef SIZEOF_SIZE_T + +/* Define if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `unsigned' if does not define. */ +#undef size_t + /* * Defined always. * FIXME: Don't know what it does or why we need it. @@ -360,4 +412,13 @@ #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 */