X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=acconfig.h;h=a8be622c400f52b63508b33845d582af46f99db1;hp=dbd11e999f12296da71e7f91563df9e4fff87201;hb=962ed628ec708d487afd1494813141fc048143d6;hpb=c133bf05fa37e3cb7258bf2d94407055e06b50e3 diff --git a/acconfig.h b/acconfig.h index dbd11e99..a8be622c 100644 --- a/acconfig.h +++ b/acconfig.h @@ -11,7 +11,7 @@ * getting ludicrously long with feature defines. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,74 @@ * * Revisions : * $Log: acconfig.h,v $ + * Revision 1.35 2008/04/06 15:18:33 fabiankeil + * Oh well, rename the --enable-pcre-host-patterns option to + * --enable-extended-host-patterns as it's not really PCRE syntax. + * + * Revision 1.34 2008/04/06 14:54:26 fabiankeil + * Use PCRE syntax in host patterns when configured + * with --enable-pcre-host-patterns. + * + * Revision 1.33 2006/12/17 19:15:26 fabiankeil + * Added ./configure switch for FEATURE_GRACEFUL_TERMINATION. + * + * Revision 1.32 2006/07/18 14:48:45 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.27.2.4 2003/12/17 16:34:40 oes + * Cosmetics + * + * Revision 1.27.2.3 2003/03/27 16:03:19 oes + * Another shot at Bug #707467 + * + * Revision 1.27.2.2 2003/03/21 14:39:12 oes + * Presumably fixed Bug #707467 by defining unix ifdef __unix__ + * + * Revision 1.27.2.1 2002/08/10 11:22:31 oes + * - Add two AC_DEFINEs that indicate if the pcre*.h headers + * are located in a pcre/ subdir to the include path. + * + * Revision 1.27 2002/04/25 19:13:57 morcego + * Removed RPM release number declaration on configure.in + * Changed makefile to use given value for RPM_PACKAGEV when on uploading + * targets (will produce an error, explaining who to do it, if no value + * if provided). + * + * Revision 1.26 2002/04/11 11:00:21 oes + * Applied Moritz' fix for socklen_t on Solaris + * + * Revision 1.25 2002/04/06 20:38:01 jongfoster + * Renaming VC++ versions of config.h + * + * Revision 1.24 2002/04/04 00:36:36 gliptak + * always use pcre for matching + * + * Revision 1.23 2002/04/03 22:28:03 gliptak + * Removed references to gnu_regex + * + * Revision 1.22 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.21 2002/03/24 14:31:08 swa + * remove more crappy files. set RPM + * release version correctly. + * + * Revision 1.20 2002/03/24 13:46:44 swa + * name change related issue. + * + * Revision 1.19 2002/03/24 13:25:42 swa + * name change related issues + * + * Revision 1.18 2002/03/08 16:40:28 oes + * Added FEATURE_NO_GIFS + * + * Revision 1.17 2002/03/04 17:52:44 oes + * Deleted PID_FILE_PATH + * + * Revision 1.16 2002/01/10 12:36:18 oes + * Moved HAVE_*_R to acconfig.h, where they belong. + * * Revision 1.15 2001/12/30 14:07:31 steudten * - Add signal handling (unix) * - Add SIGHUP handler (unix) @@ -195,19 +263,6 @@ */ #undef CODE_STATUS -/* - * pid file used under unix. - */ -#undef PID_FILE_PATH - -/* - * Regular expression matching for URLs. (Highly recommended). - * If neither of these are defined then you can ony use prefix matching. - * Don't bother to change this here! Use configure instead. - */ -#undef REGEX_GNU -#undef REGEX_PCRE - /* * Should pcre be statically built in instead of linkling with libpcre? * (This is determined by configure depending on the availiability of @@ -295,6 +350,26 @@ */ #undef FEATURE_KILL_POPUPS +/* + * Use PNG instead of GIF for built-in images + */ +#undef FEATURE_NO_GIFS + +/* + * Allow to shutdown Privoxy through the webinterface. + */ +#undef FEATURE_GRACEFUL_TERMINATION + +/* + * Allow PCRE syntax in host patterns. + */ +#undef FEATURE_EXTENDED_HOST_PATTERNS + +/* + * Keep outgoing connections alive if possible. + */ +#undef FEATURE_CONNECTION_KEEP_ALIVE + /* * Use POSIX threads instead of native threads. */ @@ -306,7 +381,7 @@ #undef FEATURE_STATISTICS /* - * Allow JunkBuster to be "disabled" so it is just a normal non-blocking + * Allow Privoxy 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. @@ -350,12 +425,24 @@ #undef HAVE_GETHOSTBYADDR_R_7_ARGS #undef HAVE_GETHOSTBYADDR_R_5_ARGS -/* Define if you have gmtime_r and localtime_r with a signature +/* Defined if you have gmtime_r and localtime_r with a signature * of (struct time *, struct tm *) */ #undef HAVE_GMTIME_R #undef HAVE_LOCALTIME_R +/* Define to 'int' if doesn't have it. + */ +#undef socklen_t + +/* Define if pcre.h must be included as + */ +#undef PCRE_H_IN_SUBDIR + +/* Define if pcreposix.h must be included as + */ +#undef PCREPOSIX_H_IN_SUBDIR + @BOTTOM@ /* @@ -384,6 +471,13 @@ #endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */ +/* + * On OpenBSD and maybe also FreeBSD, gcc doesn't define the cpp + * symbol unix; it defines __unix__ and sometimes not even that: + */ +#if ( defined(__unix__) || defined(__NetBSD__) ) && !defined(unix) +#define unix 1 +#endif /* * It's too easy to accidentally use a Cygwin or MinGW32 version of config.h @@ -391,7 +485,7 @@ * 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. +#error For MS VC++, please use vc_config_winthreads.h or vc_config_pthreads.h. You can usually do this by selecting the "Build", "Clean" menu option. #endif /* def _MSC_VER */ #endif /* CONFIG_H_INCLUDED */