X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=acconfig.h;h=0aeaabc73ef7980e90031dd747af5069fa901f65;hp=091a68e3c86658180c409affa31bac6bae36cb4e;hb=9170307ae10c8fb2807661cc362d91d588ae3ebc;hpb=ae6d611337ee16bd01fd71a560fd42207ddd2de8

diff --git a/acconfig.h b/acconfig.h
index 091a68e3..0aeaabc7 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,44 @@
  *
  * Revisions   :
  *    $Log: acconfig.h,v $
+ *    Revision 1.29  2002/09/04 12:03:18  oes
+ *    re-enable build on older setups
+ *
+ *
+ *    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
  *
@@ -201,14 +239,6 @@
  */
 #undef CODE_STATUS
 
-/*
- * 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
@@ -225,6 +255,16 @@
  */
 #undef STATIC_PCRS
 
+/* 
+ * Does pcre.h need to be included as <pcre/pcre.h>?
+ */
+#undef PCRE_H_IN_SUBDIR
+
+/* 
+ * Does pcreposix.h need to be included as <pcre/pcre.h>?
+ */
+#undef PCREPOSIX_H_IN_SUBDIR
+
 /*
  * Allows the use of an ACL to control access to the proxy by IP address.
  */
@@ -312,7 +352,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.
@@ -362,6 +402,11 @@
 #undef HAVE_GMTIME_R
 #undef HAVE_LOCALTIME_R
 
+/* Define to 'int' if <sys/socket.h> doesn't have it. 
+ */
+#undef socklen_t
+
+
 @BOTTOM@
 
 /*
@@ -397,7 +442,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 */