From f03fc94e7df1078959a4fa4a4b5c4e02b09a2bc1 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Mon, 28 Aug 2000 11:53:23 +0000
Subject: New configure test for flex, which recognizes only flex but does so
 in all incarnations (I hope). When an acceptable flex version is not found,
 print instructive error messages from both configure and the makefiles, so
 that users can continue building anyway.

---
 src/backend/bootstrap/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/backend/bootstrap')

diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index d1b40e9983..cf3b29477e 100644
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for the bootstrap module
 #
-# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.24 2000/07/19 16:29:47 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.25 2000/08/28 11:53:17 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -48,9 +48,13 @@ $(srcdir)/bootparse.c $(srcdir)/bootstrap_tokens.h: bootparse.y Makefile
 	rm -f y.tab.c y.tab.h
 
 $(srcdir)/bootscanner.c: bootscanner.l Makefile
-	$(LEX) $(LFLAGS) $<
-	$(sed-magic) < lex.yy.c > $@
+ifdef FLEX
+	$(FLEX) $(FLEXFLAGS) $<
+	$(sed-magic) lex.yy.c > $@
 	rm -f lex.yy.c
+else
+	@$(missing) flex $< $@
+endif
 
 clean:
 	rm -f SUBSYS.o $(OBJS) bootstrap.o
-- 
cgit v1.2.1