diff options
| author | Robert James Kaes <rjkaes@users.sourceforge.net> | 2004-08-14 00:37:51 +0000 |
|---|---|---|
| committer | Robert James Kaes <rjkaes@users.sourceforge.net> | 2004-08-14 00:37:51 +0000 |
| commit | 9f4323a562b9244f5bcf950e38ae41187147c8d1 (patch) | |
| tree | 1945cbc04329fb5b70f28d46a1c30eb3d443565c | |
| parent | 52562b49df1dce8beba5d443f4a9f745449e109b (diff) | |
| download | tinyproxy-9f4323a562b9244f5bcf950e38ae41187147c8d1.tar.gz tinyproxy-9f4323a562b9244f5bcf950e38ae41187147c8d1.zip | |
Removed the last code relating to the old configuration parsing
system. The grammar.y and scanner.l files still need to be removed.
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | src/Makefile.am | 7 |
2 files changed, 3 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 6482af0..db97eb5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac,v 2.65 2004-01-26 19:11:52 rjkaes Exp $ +dnl $Id: configure.ac,v 2.66 2004-08-14 00:37:51 rjkaes Exp $ dnl Devlopers, please strive to achieve this order: dnl @@ -165,8 +165,6 @@ AC_PROG_CC AC_ISC_POSIX AC_PROG_INSTALL AC_PROG_LN_S -AM_PROG_LEX -AC_PROG_YACC AC_PROG_LIBTOOL dnl If a CFLAGS variable was passed during configure, set the initial @@ -177,11 +175,6 @@ else CFLAGS="" fi -dnl Make sure YACC is actually bison -if test x"$YACC" != x"bison -y"; then - AC_MSG_WARN([You will need bison if you want to regenerate the parser.]) -fi - dnl dnl Checks for libraries dnl @@ -274,16 +267,10 @@ if test x"$debug_enabled" = x"yes" ; then CFLAGS="-Wmissing-prototypes -Wmissing-declarations $CFLAGS" CFLAGS="-Wpointer-arith -Waggregate-return -Wnested-externs $CFLAGS" fi - CFLAGS="-Wall -g -DYYDEBUG $CFLAGS" - YFLAGS="-v -d" - - if test x"$ac_cv_prog_LEX" = x"flex" ; then - LEX_FLAGS="--warn --debug" - fi + CFLAGS="-Wall -g $CFLAGS" else dnl No debugging information, include the optimizations CFLAGS="-O2 -DNDEBUG $CFLAGS" - YFLAGS="-d" fi dnl @@ -345,9 +332,7 @@ dnl Substitute the variables into the various Makefiles dnl AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) -AC_SUBST(YFLAGS) AC_SUBST(CPPFLAGS) -AC_SUBST(LEX_FLAGS) AC_SUBST(LIBS) AC_SUBST(ADDITIONAL_OBJECTS) AC_SUBST(TINYPROXY_CONFIG_DIR) diff --git a/src/Makefile.am b/src/Makefile.am index c56ebde..f189870 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.20 2004-08-13 21:04:24 rjkaes Exp $ +# $Id: Makefile.am,v 1.21 2004-08-14 00:37:50 rjkaes Exp $ # # Copyright (C) 2000 Robert James Kaes (rjkaes@flarenet.com) # @@ -13,7 +13,6 @@ # General Public License for more details. # -YFLAGS = @YFLAGS@ LDFLAGS = @LDFLAGS@ sbin_PROGRAMS = tinyproxy @@ -40,15 +39,11 @@ tinyproxy_SOURCES = \ tinyproxy.c tinyproxy.h \ utils.c utils.h \ vector.c vector.h -# grammar.y scanner.l EXTRA_tinyproxy_SOURCES = filter.c filter.h grammar.h tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@ tinyproxy_LDADD = @ADDITIONAL_OBJECTS@ -scanner.c: scanner.l grammar.h - $(LEX) $(LEX_FLAGS) $(LFLAGS) -i $< && mv $(LEX_OUTPUT_ROOT).c $@ - clean: rm -f *.da rm -f gmon.out |