tinyproxy no longer includes a fall-back regular expression library,

so these files needed to be modified to only use the system's
installed regular expression library.

5 files changed, 11 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index c42b722..dcb610d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 2.62 2003-08-07 15:31:19 rjkaes Exp $
+dnl $Id: configure.ac,v 2.63 2003-08-07 16:32:12 rjkaes Exp $
 
 dnl Devlopers, please strive to achieve this order:
 dnl
@@ -291,8 +291,7 @@ fi
 
 dnl Handle the REGEX library
 if test x"$ac_cv_func_regexec" != x"yes"; then
-    dnl We don't have a functioning REGEX so include our copy
-    tinyproxy_use_our_regex=yes
+    AC_MSG_ERROR([Could not locate the regexec() function])
 else
     AC_MSG_CHECKING([whether the system's regex library is broken])
     AC_CACHE_VAL(tinyproxy_cv_regex_broken,
@@ -326,18 +325,10 @@ int main(void)
     AC_MSG_RESULT([$tinyproxy_cv_regex_broken])
 
     if test x"$tinyproxy_cv_regex_broken" = x"yes" ; then
-        AC_MSG_NOTICE([Using the included GNU regex instead.])
-        tinyproxy_use_our_regex=yes
+        AC_MSG_ERROR([Your system's regexec() function is broken.])
     fi
 fi
 
-AH_TEMPLATE([USE_GNU_REGEX],
-            [Defined if you want to use the included regex routines.])
-if test x"$tinyproxy_use_our_regex" = x"yes" ; then
-    AC_DEFINE(USE_GNU_REGEX)
-    ADDITIONAL_OBJECTS="$ADDITIONAL_OBJECTS gnuregex.o"
-fi
-
 dnl
 dnl Substitute the variables into the various Makefiles
 dnl
diff --git a/src/Makefile.am b/src/Makefile.am
index 4a9c42f..a45e6c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.17 2003-06-26 18:23:01 rjkaes Exp $
+# $Id: Makefile.am,v 1.18 2003-08-07 16:32:12 rjkaes Exp $
 #
 # Copyright (C) 2000  Robert James Kaes (rjkaes@flarenet.com)
 #
@@ -39,10 +39,8 @@ tinyproxy_SOURCES = \
 	tinyproxy.c tinyproxy.h \
 	utils.c utils.h \
 	vector.c vector.h \
-	grammar.y scanner.l \
-	regexp.h
+	grammar.y scanner.l
 
-EXTRA_DIST = gnuregex.c gnuregex.h
 EXTRA_tinyproxy_SOURCES = filter.c filter.h grammar.h
 tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@
 tinyproxy_LDADD = @ADDITIONAL_OBJECTS@
diff --git a/src/common.h b/src/common.h
index 0982189..eaf00f9 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,4 +1,4 @@
-/* $Id: common.h,v 1.6 2003-06-25 18:20:22 rjkaes Exp $
+/* $Id: common.h,v 1.7 2003-08-07 16:32:12 rjkaes Exp $
  *
  * This file groups all the headers required throughout the tinyproxy
  * system.  All this information use to be in the "tinyproxy.h" header,
@@ -111,6 +111,9 @@
 #ifdef HAVE_PWD_H
 #  include     	<pwd.h>
 #endif
+#ifdef HAVE_REGEX_H
+#  include      <regex.h>
+#endif
 #ifdef HAVE_SIGNAL_H
 #  include      <signal.h>
 #endif
diff --git a/src/filter.c b/src/filter.c
index 8684992..34dad75 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -1,4 +1,4 @@
-/* $Id: filter.c,v 1.17 2003-07-31 23:38:28 rjkaes Exp $
+/* $Id: filter.c,v 1.18 2003-08-07 16:32:12 rjkaes Exp $
  *
  * Copyright (c) 1999  George Talusan (gstalusan@uwaterloo.ca)
  * Copyright (c) 2002  James E. Flemer (jflemer@acm.jhu.edu)
@@ -23,7 +23,6 @@
 #include "filter.h"
 #include "heap.h"
 #include "log.h"
-#include "regexp.h"
 #include "reqs.h"
 
 #define FILTER_BUFFER_LEN (512)
diff --git a/src/reqs.c b/src/reqs.c
index e108c86..3f33a7f 100644
--- a/src/reqs.c
+++ b/src/reqs.c
@@ -1,4 +1,4 @@
-/* $Id: reqs.c,v 1.107 2003-08-05 16:11:59 rjkaes Exp $
+/* $Id: reqs.c,v 1.108 2003-08-07 16:32:12 rjkaes Exp $
  *
  * This is where all the work in tinyproxy is actually done. Incoming
  * connections have a new child created for them. The child then
@@ -33,7 +33,6 @@
 #include "htmlerror.h"
 #include "log.h"
 #include "network.h"
-#include "regexp.h"
 #include "reqs.h"
 #include "sock.h"
 #include "stats.h"