X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=acconfig.h;h=2274f848775c70b8017d0cd2c48b168581c3eab9;hp=28ab8e1b4240a6e25fe82017dc39faa044a4ff13;hb=f4107f65b676b63a199fe4230e58695757f9f199;hpb=cb78ea4e900f1399e75d331eb5d8f61d9e0f0621

diff --git a/acconfig.h b/acconfig.h
index 28ab8e1b..2274f848 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -37,6 +37,32 @@
  *
  * Revisions   :
  *    $Log: acconfig.h,v $
+ *    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
+ *    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
  *
@@ -216,11 +242,6 @@
  */
 #undef VERSION_POINT
 
-/*
- * Version number - RPM-release
- */
-#undef VERSION_RPM_PACKAGE
-
 /*
  * Version number, as a string
  */
@@ -323,6 +344,11 @@
  */
 #undef FEATURE_NO_GIFS
 
+/*
+ * Allow to shutdown Privoxy through the webinterface.
+ */
+#undef FEATURE_GRACEFUL_TERMINATION
+
 /*
  * Use POSIX threads instead of native threads.
  */
@@ -378,7 +404,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
@@ -388,6 +414,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@
 
@@ -417,6 +450,13 @@
 
 #endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */
 
+/*
+ * On OpenBSD and maybe also FreeBSD, gcc doesn't define the cpp
+ * symbol unix; it defines __unix__ and sometimes not even that:
+ */
+#if ( defined(__unix__) || defined(__NetBSD__) ) && !defined(unix)
+#define unix 1
+#endif
 
 /*
  * It's too easy to accidentally use a Cygwin or MinGW32 version of config.h