[Asterisk-cvs] asterisk Makefile,1.155,1.156

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv24233

Modified Files:
	Makefile 
Log Message:
temporarily suppress usage of vercomp.sh script until it can be fixed


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- Makefile	16 May 2005 00:35:38 -0000	1.155
+++ Makefile	16 May 2005 13:51:56 -0000	1.156
@@ -259,9 +259,9 @@
 endif
 LIBS+=-lssl
 
-FLEXVER_GT_2_5_31=$(shell ./vercomp.sh flex \>= 2.5.31)
-BISONVER=$(shell bison --version | grep \^bison | egrep -o '[0-9]+\.[-0-9.]+[a-z]?' )
-BISONVERGE_85=$(shell ./vercomp.sh bison \>= 1.85 )
+#FLEXVER_GT_2_5_31=$(shell ./vercomp.sh flex \>= 2.5.31)
+#BISONVER=$(shell bison --version | grep \^bison | egrep -o '[0-9]+\.[-0-9.]+[a-z]?' )
+#BISONVERGE_85=$(shell ./vercomp.sh bison \>= 1.85 )
 
 ifeq (${FLEXVER_GT_2_5_31},true)
 FLEXOBJS=ast_expr2.o ast_expr2f.o
@@ -344,30 +344,31 @@
 .version: _version
 
 .y.c:
-	@if (($(BISONVERGE_85) = false)); then \
-		echo ================================================================================= ;\
-		echo NOTE: you may have trouble if you do not have bison-1.85 or higher installed! ;\
-		echo NOTE: you can pick up a copy at: http://ftp.gnu.org/ or its mirrors ;\
-		echo NOTE: You Have: $(BISONVER) ;\
-		echo ================================================================================; \
-	else \
-		echo EXCELLENT-- You have Bison version $(BISONVER), this should work just fine...;\
-	fi
+#	@if (($(BISONVERGE_85) = false)); then \
+#		echo ================================================================================= ;\
+#		echo NOTE: you may have trouble if you do not have bison-1.85 or higher installed! ;\
+#		echo NOTE: you can pick up a copy at: http://ftp.gnu.org/ or its mirrors ;\
+#		echo NOTE: You Have: $(BISONVER) ;\
+#		echo ================================================================================; \
+#	else \
+#		echo EXCELLENT-- You have Bison version $(BISONVER), this should work just fine...;\
+#	fi
 	bison -v -d --name-prefix=ast_yy $< -o $@
 
 ast_expr.o: ast_expr.c
-	@echo NOTE:
-	@echo NOTE:
-	@echo NOTE: Using older version of ast_expr. To use the newer version,
-	@echo NOTE: Upgrade to flex 2.5.31 or higher, which can be found at http://
-	@echo NOTE:  http://sourceforge.net/project/showfiles.php?group_id=72099
-	@echo NOTE:
-	@echo NOTE:
+#	@echo NOTE:
+#	@echo NOTE:
+#	@echo NOTE: Using older version of ast_expr. To use the newer version,
+#	@echo NOTE: Upgrade to flex 2.5.31 or higher, which can be found at http://
+#	@echo NOTE:  http://sourceforge.net/project/showfiles.php?group_id=72099
+#	@echo NOTE:
+#	@echo NOTE:
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) ast_expr.c
 
 ast_expr2.o: ast_expr2.c
 
 ast_expr2f.o: ast_expr2f.c
+
 ast_expr2f.c: ast_expr2.fl
 	flex ast_expr2.fl
 
@@ -383,7 +384,6 @@
 	gcc -g -o testexpr2 ast_expr2f.o ast_expr2.o
 	rm ast_expr2.c ast_expr2.o ast_expr2f.o ast_expr2f.c
 
-
 manpage: asterisk.8.gz
 
 asterisk.8.gz: asterisk.sgml