From c9bedeeb530fb2011569a42752b40f4742754520 Mon Sep 17 00:00:00 2001
From: Gabor Liptak <gliptak@gmail.com>
Date: Wed, 3 Apr 2002 22:28:03 +0000
Subject: [PATCH] Removed references to gnu_regex
---
GNUmakefile.in | 7 ++++---
acconfig.h | 4 +++-
cgisimple.c | 15 ++++-----------
config.h.win | 4 +++-
configure.in | 21 +++++++--------------
project.h | 13 ++++++-------
6 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index af641f73..37c86943 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.54 2002/04/03 14:54:07 oes Exp $
+# $Id: GNUmakefile.in,v 1.55 2002/04/03 19:54:29 swa Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
@@ -152,8 +152,6 @@ PCRE_HDRS = @STATIC_PCRE_ONLY@pcre/config.h pcre/chartables.c pcre/internal.h
# No REGEX (Either because dynamically linked pcreposix, or no regex at all):
REGEX_SRC =
-# GNU REGEX:
-@GNU_REGEX_ONLY@REGEX_SRC = gnu_regex.c
# PCRE REGEX:
@PCRE_REGEX_ONLY@@STATIC_PCRE_ONLY@REGEX_SRC = pcre/pcreposix.c
@@ -702,6 +700,9 @@ install: all
## end:
# $Log: GNUmakefile.in,v $
+# Revision 1.55 2002/04/03 19:54:29 swa
+# freebsd tested to work. attempt to move tarball dist target forward
+#
# Revision 1.54 2002/04/03 14:54:07 oes
# Standard clean and clobber semantics II
#
diff --git a/acconfig.h b/acconfig.h
index bf746a61..a7c60476 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -37,6 +37,9 @@
*
* Revisions :
* $Log: acconfig.h,v $
+ * 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.
@@ -224,7 +227,6 @@
* 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
/*
diff --git a/cgisimple.c b/cgisimple.c
index c230054b..326c5e4a 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.23 2002/03/26 22:29:54 swa Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.24 2002/04/02 16:12:47 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.23 2002/03/26 22:29:54 swa Ex
*
* Revisions :
* $Log: cgisimple.c,v $
+ * Revision 1.24 2002/04/02 16:12:47 oes
+ * Fix: moving misplaced lines into #ifdef FEATURE_FORCE
+ *
* Revision 1.23 2002/03/26 22:29:54 swa
* we have a new homepage!
*
@@ -1171,12 +1174,6 @@ static jb_err show_defines(struct map *exports)
if (!err) err = map_conditional(exports, "FEATURE_TRUST", 0);
#endif /* ndef FEATURE_TRUST */
-#ifdef REGEX_GNU
- if (!err) err = map_conditional(exports, "REGEX_GNU", 1);
-#else /* ifndef REGEX_GNU */
- if (!err) err = map_conditional(exports, "REGEX_GNU", 0);
-#endif /* def REGEX_GNU */
-
#ifdef REGEX_PCRE
if (!err) err = map_conditional(exports, "REGEX_PCRE", 1);
#else /* ifndef REGEX_PCRE */
@@ -1251,10 +1248,6 @@ static char *show_rcs(void)
SHOW_RCS(filters_rcs)
SHOW_RCS(gateway_h_rcs)
SHOW_RCS(gateway_rcs)
-#ifdef GNU_REGEX
- SHOW_RCS(gnu_regex_h_rcs)
- SHOW_RCS(gnu_regex_rcs)
-#endif /* def GNU_REGEX */
SHOW_RCS(jbsockets_h_rcs)
SHOW_RCS(jbsockets_rcs)
SHOW_RCS(jcc_h_rcs)
diff --git a/config.h.win b/config.h.win
index 01411178..fdb144e5 100755
--- a/config.h.win
+++ b/config.h.win
@@ -37,6 +37,9 @@
*
* Revisions :
* $Log: config.h.win,v $
+ * Revision 1.19 2002/03/26 22:29:54 swa
+ * we have a new homepage!
+ *
* Revision 1.18 2002/03/24 17:08:12 jongfoster
* Version number bump
*
@@ -210,7 +213,6 @@
* If neither of these are defined then you can ony use prefix matching.
* Don't bother to change this here! Use configure instead.
*/
-/* #define REGEX_GNU 1 */
#define REGEX_PCRE 1
/*
diff --git a/configure.in b/configure.in
index 3259d775..42167167 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl $Id: configure.in,v 1.54 2002/04/01 00:54:24 gliptak Exp $
+dnl $Id: configure.in,v 1.55 2002/04/03 03:54:38 gliptak Exp $
dnl
dnl Written by and Copyright (C) 2001, 2002 the SourceForge
dnl Privoxy team. http://www.privoxy.org/
@@ -28,6 +28,9 @@ dnl or write to the Free Software Foundation, Inc., 59
dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA.
dnl
dnl $Log: configure.in,v $
+dnl Revision 1.55 2002/04/03 03:54:38 gliptak
+dnl Checking pcre version
+dnl
dnl Revision 1.54 2002/04/01 00:54:24 gliptak
dnl More changes needed around regex support.
dnl
@@ -318,7 +321,7 @@ dnl =================================================================
dnl AutoConf Initialization
dnl =================================================================
-AC_REVISION($Revision: 1.54 $)
+AC_REVISION($Revision: 1.55 $)
AC_INIT(jcc.c)
AC_CONFIG_HEADER([config.h])
AC_CANONICAL_HOST
@@ -965,8 +968,6 @@ dnl dynamic:
AC_ARG_ENABLE(regex-matching,
[ --enable-regex-matching=pcre Use perl-compatible regex for actionsfile
pattern matching (default)
- --enable-regex-matching=gnu Use gnu style regex for actionsfile pattern
- matching (-> bigger binary)
--disable-regex-matching Don't use regex matching, compare URL
prefix instead (won't shrink birary)],
[ regex_matching=$enableval ],
@@ -1023,28 +1024,20 @@ else
fi
# Which method should be used for URL matching?
-# pcre, gnu regex or prefix matching?
+# pcre or prefix matching?
#
-if test $regex_matching = "gnu"; then
- echo "using gnu regex for URL matching"
- AC_DEFINE(REGEX_GNU)
- GNU_REGEX_ONLY=
- PCRE_REGEX_ONLY=#
-elif test $regex_matching = "pcre"; then
+if test $regex_matching = "pcre"; then
echo "using pcre regex for URL matching"
AC_DEFINE(REGEX_PCRE)
- GNU_REGEX_ONLY=#
PCRE_REGEX_ONLY=
if test $pcre_dyn = "yes"; then
LIBS="$LIBS -lpcreposix"
fi
else
echo -e "using prefix matching for URLs\nHint: This does NOT make the executable any smaller!"
- GNU_REGEX_ONLY=#
PCRE_REGEX_ONLY=#
fi
-AC_SUBST(GNU_REGEX_ONLY)
AC_SUBST(PCRE_REGEX_ONLY)
AC_SUBST(STATIC_PCRE_ONLY)
AC_SUBST(STATIC_PCRS_ONLY)
diff --git a/project.h b/project.h
index 0b7b75e7..e9502848 100644
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
#ifndef PROJECT_H_INCLUDED
#define PROJECT_H_INCLUDED
-#define PROJECT_H_VERSION "$Id: project.h,v 1.62 2002/03/26 22:48:49 swa Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.63 2002/03/31 17:19:00 jongfoster Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,9 @@
*
* Revisions :
* $Log: project.h,v $
+ * Revision 1.63 2002/03/31 17:19:00 jongfoster
+ * Win32 only: Enabling STRICT to fix a VC++ compile warning.
+ *
* Revision 1.62 2002/03/26 22:48:49 swa
* new homepage url
*
@@ -420,9 +423,9 @@
* and are included anyway.
*/
-#if defined(REGEX_PCRE) || defined (REGEX_GNU)
+#if defined(REGEX_PCRE)
# define REGEX
-#endif /* defined(REGEX_PCRE) || defined (REGEX_GNU) */
+#endif /* defined(REGEX_PCRE) */
#ifdef STATIC_PCRE
# include "pcre.h"
@@ -444,10 +447,6 @@
# endif
#endif /* defined(REGEX_PCRE) */
-#if defined(REGEX_GNU)
-# include "gnu_regex.h"
-#endif
-
#ifdef AMIGA
#include "amiga.h"
#endif /* def AMIGA */
--
2.50.1