From: jongfoster Date: Sun, 16 Sep 2001 16:19:02 +0000 (+0000) Subject: New version based on latest configure.in and acconfig.h X-Git-Tag: v_2_9_9~75 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=9a1d436fbe1d55e4080c02c6c02d9fdc47f83171 New version based on latest configure.in and acconfig.h --- diff --git a/config.h.in b/config.h.in index 27395d3f..9c4743f6 100644 --- a/config.h.in +++ b/config.h.in @@ -38,6 +38,9 @@ * * Revisions : * $Log: acconfig.h,v $ + * 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 @@ -153,14 +156,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._._) @@ -306,6 +301,11 @@ */ #undef FEATURE_TRUST +/* + * Defined on Solaris only. Makes the system libraries thread safe. + */ +#undef _REENTRANT + /* * Defined on Solaris only. Without this, many important functions are not * defined in the system headers. @@ -319,15 +319,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. diff --git a/config.h.win b/config.h.win index 797882df..5089cd73 100755 --- a/config.h.win +++ b/config.h.win @@ -1,7 +1,5 @@ -/* config.h. Generated automatically by configure. */ -/* 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/config.h.win,v $ @@ -39,6 +37,12 @@ * * Revisions : * $Log: config.h.win,v $ + * Revision 1.9 2001/07/30 22:16:07 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.8 2001/07/25 19:16:27 oes * Bumping version number to 2.9.8 * @@ -148,15 +152,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. */ -#define STDC_HEADERS 1 - /* * Version number - Major (X._._) */ @@ -187,32 +182,7 @@ * 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 */ -#define REGEX_PCRE 1 - -/* - * Should pcre be statically built in instead of linkling with libpcre? - * (This is determined by configure depending on the availiability of - * libpcre and user preferences). The name is ugly, but pcre needs it. - * Don't bother to change this here! Use configure instead. - */ -#define STATIC_PCRE 1 - -/* - * Should pcrs be statically built in instead of linkling with libpcrs? - * (This is determined by configure depending on the availiability of - * libpcrs and user preferences). - * Don't bother to change this here! Use configure instead. - */ -#define STATIC_PCRS 1 - - -/* - * 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 */ +/* #define REGEX_GNU 1 */ #define REGEX_PCRE 1 /* @@ -246,7 +216,7 @@ * the PCRE regexps. (Commonly happens with Netscape browsers). * This forces it to be uncompressed. */ -/* #undef FEATURE_DENY_GZIP */ +#define FEATURE_DENY_GZIP 1 /* * Locally redirect remote script-redirect URLs @@ -326,15 +296,103 @@ */ #define FEATURE_TRUST 1 -/* Define if you have the bcopy function. */ -#define HAVE_BCOPY 1 -/* Define if you have the memmove function. */ +/**************************************************************************** + * The following values are correct for MS VC++97. + * You should normally not change them. + ***************************************************************************/ + + +/* + * Defined on Solaris only. Makes the system libraries thread safe. + */ +/* #define _REENTRANT 1 */ + +/* + * Defined on Solaris only. Without this, many important functions are not + * defined in the system headers. + */ +/* #define __EXTENSIONS__ 1 */ + +/* + * Defined always. + * FIXME: Don't know what it does or why we need it. + * (presumably something to do with MultiThreading?) + */ +#define __MT__ 1 + + +/* Define if you have the `bcopy' function. */ +/* #define HAVE_BCOPY 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_INTTYPES_H 1 */ + +/* Define if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 -/* Define if you have the strerror function. */ +/* Define if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_STDINT_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the `strerror' function. */ #define HAVE_STRERROR 1 +/* Define if you have the header file. */ +/* #define HAVE_STRINGS_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_UNISTD_H 1 */ + +/* The size of a `char *', as computed by sizeof. */ +#define SIZEOF_CHAR_P 4 + +/* The size of a `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of a `long long', as computed by sizeof. */ +/* #define SIZEOF_LONG_LONG ---not supported--- */ + +/* The size of a `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 4 + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #define const */ + +/* Define to `unsigned' if does not define. */ +/* #define size_t unsigned */ + +/* + * Defined always. + * FIXME: Don't know what it does or why we need it. + * (presumably something to do with ANSI Standard C?) + */ +/* Don't define for MS VC++ or you don't get strdup() declared. +#ifndef __STDC__ +#define __STDC__ 1 +#endif +*/ + /* * Need to set up this define only for the Pthreads library for * Win32, available from http://sources.redhat.com/pthreads-win32/ @@ -343,4 +401,19 @@ #define __CLEANUP_C #endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */ -#endif /* _CONFIG_H */ +/* + * BEOS does not currently support POSIX threads. + * This *should* be detected by ./configure, but let's be sure. + */ +#if defined(FEATURE_PTHREAD) && defined(__BEOS__) +#error BEOS does not support pthread - please run ./configure again with "--disable-pthread" + +#endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */ + + +#ifndef _MSC_VER +#error This file is only intended for MS VC++ on Win32. For other compilers, please run configure. +#endif /* def _MSC_VER */ + +#endif /* CONFIG_H_INCLUDED */ + diff --git a/config.h.win32threads.win b/config.h.win32threads.win index f45d0e63..4488821d 100644 --- a/config.h.win32threads.win +++ b/config.h.win32threads.win @@ -1,10 +1,8 @@ -/* config.h. Generated automatically by configure. */ -/* 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/config.h.win32threads.win,v $ + * File : $Source: /cvsroot/ijbswa/current/config.h.win,v $ * * Purpose : This file should be the first thing included in every * .c file. (Before even system headers). It contains @@ -38,14 +36,20 @@ * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Revisions : - * $Log: config.h.win32threads.win,v $ - * Revision 1.3 2001/07/25 19:16:27 oes + * $Log: config.h.win,v $ + * Revision 1.9 2001/07/30 22:16:07 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.8 2001/07/25 19:16:27 oes * Bumping version number to 2.9.8 * - * Revision 1.2 2001/07/21 18:00:07 jongfoster + * Revision 1.7 2001/07/21 18:00:07 jongfoster * Bumping version number to 2.9.7 * - * Revision 1.1 2001/07/15 20:08:40 jongfoster + * Revision 1.6 2001/07/15 20:08:40 jongfoster * New build files for VC++ which provide the option of POSIX * or Win32 threads. * @@ -148,15 +152,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. */ -#define STDC_HEADERS 1 - /* * Version number - Major (X._._) */ @@ -187,7 +182,7 @@ * 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 */ +/* #define REGEX_GNU 1 */ #define REGEX_PCRE 1 /* @@ -207,40 +202,39 @@ #define STATIC_PCRS 1 /* - * 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). + * Allows the use of an ACL to control access to the proxy by IP address. */ -#define FEATURE_TOGGLE 1 +#define FEATURE_ACL 1 /* - * 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 jar files to capture cookies. */ -#define FEATURE_DENY_GZIP 1 +#define FEATURE_COOKIE_JAR 1 /* - * Enables statistics function. + * 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. */ -#define FEATURE_STATISTICS 1 +#define FEATURE_DENY_GZIP 1 /* - * Bypass filtering for 1 page only + * Locally redirect remote script-redirect URLs */ -#define FEATURE_FORCE_LOAD 1 +#define FEATURE_FAST_REDIRECTS 1 /* - * Locally redirect remote script-redirect URLs + * Bypass filtering for 1 page only */ -#define FEATURE_FAST_REDIRECTS 1 +#define FEATURE_FORCE_LOAD 1 /* - * Kills JavaScript popups - window.open, onunload, etc. + * 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. */ -#define FEATURE_KILL_POPUPS 1 +#define FEATURE_IMAGE_BLOCKING 1 /* * Detect image requests automatically for MSIE. Will fall back to @@ -275,42 +269,130 @@ #define FEATURE_IMAGE_DETECT_MSIE 1 /* - * 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. */ -#define FEATURE_IMAGE_BLOCKING 1 +#define FEATURE_KILL_POPUPS 1 /* - * Allows the use of ACL files to control access to the proxy by IP address. + * Use POSIX threads instead of native threads. */ -#define FEATURE_ACL 1 +/* #define FEATURE_PTHREAD 1 */ + +/* + * Enables statistics function. + */ +#define FEATURE_STATISTICS 1 + +/* + * 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. + */ +#define FEATURE_TOGGLE 1 /* * Allows the use of trust files. */ #define FEATURE_TRUST 1 + +/**************************************************************************** + * The following values are correct for MS VC++97. + * You should normally not change them. + ***************************************************************************/ + + /* - * Allows the use of jar files to capture cookies. + * Defined on Solaris only. Makes the system libraries thread safe. */ -#define FEATURE_COOKIE_JAR 1 +/* #define _REENTRANT 1 */ /* - * Use POSIX threads instead of native threads. + * Defined on Solaris only. Without this, many important functions are not + * defined in the system headers. */ -/* #undef FEATURE_PTHREAD */ +/* #define __EXTENSIONS__ 1 */ -/* Define if you have the bcopy function. */ -#define HAVE_BCOPY 1 +/* + * Defined always. + * FIXME: Don't know what it does or why we need it. + * (presumably something to do with MultiThreading?) + */ +#define __MT__ 1 + + +/* Define if you have the `bcopy' function. */ +/* #define HAVE_BCOPY 1 */ -/* Define if you have the memmove function. */ +/* Define if you have the header file. */ +/* #define HAVE_INTTYPES_H 1 */ + +/* Define if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 -/* Define if you have the strerror function. */ +/* Define if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_STDINT_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the `strerror' function. */ #define HAVE_STRERROR 1 +/* Define if you have the header file. */ +/* #define HAVE_STRINGS_H 1 */ + +/* Define if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_UNISTD_H 1 */ + +/* The size of a `char *', as computed by sizeof. */ +#define SIZEOF_CHAR_P 4 + +/* The size of a `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of a `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of a `long long', as computed by sizeof. */ +/* #define SIZEOF_LONG_LONG ---not supported--- */ + +/* The size of a `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 4 + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #define const */ + +/* Define to `unsigned' if does not define. */ +/* #define size_t unsigned */ + +/* + * Defined always. + * FIXME: Don't know what it does or why we need it. + * (presumably something to do with ANSI Standard C?) + */ +/* Don't define for MS VC++ or you don't get strdup() declared. +#ifndef __STDC__ +#define __STDC__ 1 +#endif +*/ + /* * Need to set up this define only for the Pthreads library for * Win32, available from http://sources.redhat.com/pthreads-win32/ @@ -319,4 +401,19 @@ #define __CLEANUP_C #endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */ -#endif /* _CONFIG_H */ +/* + * BEOS does not currently support POSIX threads. + * This *should* be detected by ./configure, but let's be sure. + */ +#if defined(FEATURE_PTHREAD) && defined(__BEOS__) +#error BEOS does not support pthread - please run ./configure again with "--disable-pthread" + +#endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */ + + +#ifndef _MSC_VER +#error This file is only intended for MS VC++ on Win32. For other compilers, please run configure. +#endif /* def _MSC_VER */ + +#endif /* CONFIG_H_INCLUDED */ +