From: oes <oes@users.sourceforge.net>
Date: Fri, 13 Jul 2001 13:50:44 +0000 (+0000)
Subject: Freshly generated from (changed) acconfig.h
X-Git-Tag: v_2_9_9~279
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=8b42003192481883306c4a8aea262d1f22341c87

Freshly generated from (changed) acconfig.h
---

diff --git a/config.h.in b/config.h.in
index b88a04a3..74b41aad 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,7 +3,7 @@
 #define _CONFIG_H
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/config.h.in,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/acconfig.h,v $
  *
  * Purpose     :  This file should be the first thing included in every
  *                .c file.  (Before even system headers).  It contains 
@@ -37,8 +37,18 @@
  *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  * Revisions   :
- *    $Log: config.h.in,v $
- *    Revision 1.3  2001/05/29 09:50:24  jongfoster
+ *    $Log: acconfig.h,v $
+ *    Revision 1.5  2001/07/13 13:48:37  oes
+ *     - (Fix:) Copied CODE_STATUS #define from config.h.in
+ *     - split REGEX #define into REGEX_GNU and REGEX_PCRE
+ *       and removed PCRE.
+ *       (REGEX = REGEX_GNU || REGEX_PCRE per project.h)
+ *     - Moved STATIC (for pcre) here from Makefile.in
+ *     - Introduced STATIC_PCRS #define to allow for dynaimc linking with
+ *       libpcrs
+ *     - Removed PCRS #define, since pcrs is now needed for CGI anyway
+ *
+ *    Revision 1.4  2001/05/29 09:50:24  jongfoster
  *    Unified blocklist/imagelist/permissionslist.
  *    File format is still under discussion, but the internal changes
  *    are (mostly) done.
@@ -152,10 +162,28 @@
 #undef CODE_STATUS
 
 /*
- * Regular expression matching for URLs.  (Highly recommended).  If this is 
- * not defined then you can ony use prefix matching.
+ * Regular expression matching for URLs.  (Highly recommended).  If none of these 
+ * is defined then you can ony use prefix matching.
+ * Don't bother to change this here! Use configure instead.
  */
-#undef REGEX
+#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
+ * libpcre and user preferences). The name is ugly, but pcre needs it.
+ * Don't bother to change this here! Use configure instead.
+ */
+#undef STATIC
+
+/* 
+ * 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.
+ */
+#undef STATIC_PCRS
 
 /*
  * Allow JunkBuster to be "disabled" so it is just a normal non-blocking
@@ -166,11 +194,6 @@
  */
 #undef TOGGLE
 
-/*
- * Enables arbitrary content modification regexps
- */
-#undef PCRS
-
 /*
  * If a stream is compressed via gzip (Netscape specific I think), then
  * it cannot be modified with Perl regexps.  This forces it to be 
@@ -263,11 +286,6 @@
  */
 #undef JAR_FILES
 
-/*
- * Use PCRE rather than GNU Regex
- */
-#undef PCRE
-
 /* Define if you have the bcopy function.  */
 #undef HAVE_BCOPY