X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=acconfig.h;h=fa6706b5448943c9ebb9aab05b505396fdedf66a;hp=cbffe940466cc839e62dba12c0d9c249245fb7e5;hb=0d508593861ce547d7cff8dfabd97a93ea9b9047;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232

diff --git a/acconfig.h b/acconfig.h
index cbffe940..fa6706b5 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
- *                Privoxy 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,31 @@
  *
  * Revisions   :
  *    $Log: acconfig.h,v $
+ *    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
  *
@@ -204,14 +229,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
@@ -315,7 +332,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.
@@ -365,6 +382,11 @@
 #undef HAVE_GMTIME_R
 #undef HAVE_LOCALTIME_R
 
+/* Define to 'int' if <sys/socket.h> doesn't have it. 
+ */
+#undef socklen_t
+
+
 @BOTTOM@
 
 /*
@@ -400,7 +422,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 */