X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=acconfig.h;h=a8be622c400f52b63508b33845d582af46f99db1;hp=815f3f8ece8f68561d296928897def9f394ee137;hb=49d50fe297696103a2e15ce74eb0e38dea868896;hpb=2d10f86ba83144e62cf362ed4d9f1aef824c0bf7

diff --git a/acconfig.h b/acconfig.h
index 815f3f8e..a8be622c 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -37,12 +37,33 @@
  *
  * Revisions   :
  *    $Log: acconfig.h,v $
- *    Revision 1.30  2002/09/06 12:14:12  oes
- *    Added missing preproc symbols PCRE*_H_IN_SUBDIR
+ *    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.29  2002/09/04 12:03:18  oes
- *    re-enable build on older setups
+ *    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
@@ -258,16 +279,6 @@
  */
 #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.
  */
@@ -344,6 +355,21 @@
  */
 #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.
  */
@@ -399,7 +425,7 @@
 #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
@@ -409,6 +435,13 @@
  */
 #undef socklen_t
 
+/* Define if pcre.h must be included as <pcre/pcre.h>
+ */
+#undef PCRE_H_IN_SUBDIR
+
+/* Define if pcreposix.h must be included as <pcre/pcreposix.h>
+ */
+#undef PCREPOSIX_H_IN_SUBDIR
 
 @BOTTOM@
 
@@ -440,9 +473,9 @@
 
 /*
  * On OpenBSD and maybe also FreeBSD, gcc doesn't define the cpp
- * symbol unix; it defines __unix__
+ * symbol unix; it defines __unix__ and sometimes not even that:
  */
-#if defined(__unix__) && !defined(unix)
+#if ( defined(__unix__) || defined(__NetBSD__) ) && !defined(unix)
 #define unix 1
 #endif