Log Message:
-----------
don't depend on system make rules to lex and yacc around

Modified Files:
--------------
    slony1-engine:
        configure.ac (r1.30 -> r1.31)
        Makefile.global.in (r1.14 -> r1.15)
    slony1-engine/src/slonik:
        Makefile (r1.10 -> r1.11)

-------------- next part --------------
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.14 -r1.15
--- Makefile.global.in
+++ Makefile.global.in
@@ -31,7 +31,13 @@
 PTHREAD_CFLAGS	= @PTHREAD_CFLAGS@
 PTHREAD_LIBS	= @PTHREAD_LIBS@
 PTHREAD_CC		= @PTHREAD_CC@
+
 CC = @CC@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+FLEX = @LEX@
+FLEXFLAGS = @LEXFLAGS@ $(LFLAGS)
+
 
 # Installation.
 
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.30 -r1.31
--- configure.ac
+++ configure.ac
@@ -57,7 +57,15 @@
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_LD
+AC_PROG_LEX
+AC_PROG_YACC
 AC_SUBST(LD)
+AC_SUBST(CC)
+AC_SUBST(YACC)
+AC_SUBST(YFLAGS)
+AC_SUBST(LEXFLAGS)
+AC_SUBST(YFLAGS)
+
 AC_SUBST(with_gnu_ld)
 ACX_PTHREAD()
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/slonik/Makefile -Lsrc/slonik/Makefile -u -w -r1.10 -r1.11
--- src/slonik/Makefile
+++ src/slonik/Makefile
@@ -42,8 +42,23 @@
 slonik.o:			slonik.c slonik.h
 dbutil.o:			dbutil.c slonik.h
 parser.o:			parser.c scan.c
+
 parser.c:			parser.y slonik.h
+ifdef YACC
+	$(YACC) -d $(YFLAGS) $<
+	mv -f y.tab.c parser.c
+else
+	@echo "Missing yacc $< $@"
+	@exit 1
+endif
+
 scan.c:				scan.l slonik.h
+ifdef FLEX
+	$(FLEX) $(FLEXFLAGS) -o'$@' $<
+else
+	@echo "Missing flex $< $@"
+	@exit
+endif
 
 clean distclean:
 	rm -f $(ALL) $(OBJS)