Rename STATIC_PCRE to FEATURE_DYNAMIC_PCRE

... to be more consistent with other feature names.

STATIC_PCRE is still defined as it's expected by the internal
pcre to statically link on Windows.

diff --git a/cgisimple.c b/cgisimple.c
index 1a884a8..aaa3cd7 100644 (file)
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.121 2014/05/05 09:55:51 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.122 2014/05/20 11:54:24 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $


@@ -1717,8 +1717,8 @@ static jb_err show_defines(struct map *exports)
 #endif
       },
       {
 #endif
       },
       {

-         "STATIC_PCRE",
-#ifdef STATIC_PCRE
+         "FEATURE_DYNAMIC_PCRE",
+#ifdef FEATURE_DYNAMIC_PCRE

          1,
 #else
          0,
          1,
 #else
          0,

diff --git a/configure.in b/configure.in
index 0b4de0a..acad7f2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl

-dnl $Id: configure.in,v 1.180 2013/03/20 11:25:52 fabiankeil Exp $
+dnl $Id: configure.in,v 1.181 2013/11/07 15:11:32 fabiankeil Exp $

 dnl
 dnl Written by and Copyright (C) 2001-2010 the
 dnl Privoxy team. http://www.privoxy.org/
 dnl
 dnl Written by and Copyright (C) 2001-2010 the
 dnl Privoxy team. http://www.privoxy.org/


@@ -32,7 +32,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
 dnl AutoConf Initialization
 dnl =================================================================
 

-AC_REVISION($Revision: 1.180 $)
+AC_REVISION($Revision: 1.181 $)

 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then


@@ -1035,13 +1035,16 @@ fi
 if test $have_pcre = "yes"; then
   echo "using libpcre"
   pcre_dyn=yes
 if test $have_pcre = "yes"; then
   echo "using libpcre"
   pcre_dyn=yes

+  AC_DEFINE(FEATURE_DYNAMIC_PCRE,1,[Define to dynamically link to pcre.])

   STATIC_PCRE_ONLY=#
   LIBS="$LIBS -lpcre -lpcreposix"
 else
   AC_MSG_WARN([You are using the static PCRE code which is out of date and scheduled for removal, for details see:
     http://sourceforge.net/mailarchive/forum.php?thread_name=20080511195555.2dc6cfdc%40fabiankeil.de&forum_name=ijbswa-developers])
   pcre_dyn=no
   STATIC_PCRE_ONLY=#
   LIBS="$LIBS -lpcre -lpcreposix"
 else
   AC_MSG_WARN([You are using the static PCRE code which is out of date and scheduled for removal, for details see:
     http://sourceforge.net/mailarchive/forum.php?thread_name=20080511195555.2dc6cfdc%40fabiankeil.de&forum_name=ijbswa-developers])
   pcre_dyn=no

-  AC_DEFINE(STATIC_PCRE)
+  # STATIC_PCRE is a name pcre needs to statically link on Windows.
+  # Privoxy itself no longer uses it.
+  AC_DEFINE(STATIC_PCRE,1,[Define to statically link to internal outdated pcre on Windows.])

   STATIC_PCRE_ONLY=
 fi
 
   STATIC_PCRE_ONLY=
 fi
 

diff --git a/templates/show-status b/templates/show-status
index bdbafe8..c5e59c0 100644 (file)
--- a/templates/show-status
+++ b/templates/show-status
@@ -264,6 +264,14 @@
                Requires the connection-sharing config directive to be set.
               </td>
             </tr>
                Requires the connection-sharing config directive to be set.
               </td>
             </tr>

+            <tr>
+              <td><code>FEATURE_DYNAMIC_PCRE</code></td>
+              <td>@if-FEATURE_DYNAMIC_PCRE-then@ Yes @else-not-FEATURE_DYNAMIC_PCRE@ No @endif-FEATURE_DYNAMIC_PCRE@</td>
+              <td>Dynamically link to the PCRE library. This is set automatically
+               by <code>./configure</code> if you do not have libpcre installed.
+               Dynamically linking to an external libpcre is recommended as the one that is distributed
+               with Privoxy itself is outdated and lacks various features and bug-fixes you may be interested in.</td>
+            </tr>

             <tr>
               <td><code>FEATURE_FAST_REDIRECTS</code></td>
               <td>@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@</td>
             <tr>
               <td><code>FEATURE_FAST_REDIRECTS</code></td>
               <td>@if-FEATURE_FAST_REDIRECTS-then@ Yes @else-not-FEATURE_FAST_REDIRECTS@ No @endif-FEATURE_FAST_REDIRECTS@</td>


@@ -336,14 +344,6 @@
               <td>Allows to decompress gzip and zlib compressed documents for filtering.
                 Requires external zlib library and hasn't been tested on all platforms.</td>
             </tr>
               <td>Allows to decompress gzip and zlib compressed documents for filtering.
                 Requires external zlib library and hasn't been tested on all platforms.</td>
             </tr>

-            <tr>
-              <td><code>STATIC_PCRE</code></td>
-              <td>@if-STATIC_PCRE-then@ Yes @else-not-STATIC_PCRE@ No @endif-STATIC_PCRE@</td>
-              <td>Use the supplied statically-linked PCRE library. This is set automatically
-               by <code>./configure</code> if you do not have the libpcre installed.
-               Dynamically linking to an external libpcre is recommended as the internal
-               one is outdated and lacks various features and bug-fixes you may be interested in.</td>
-            </tr>

           </table>
       </td>
     </tr>
           </table>
       </td>
     </tr>