[Vegastrike-cvs] SF.net SVN: vegastrike: [10731] trunk/vegastrike

[<ac...@us...>]

Revision: 10731
          http://svn.sourceforge.net/vegastrike/?rev=10731&view=rev
Author:   ace123
Date:     2006-09-24 17:43:21 -0700 (Sun, 24 Sep 2006)

Log Message:
-----------
Fixed scripts to not reference lex and bison, because of the bugs that pmx and JasonStiletto in the forum noticed.
The code shouldn't be using lex any more.

Modified Paths:
--------------
    trunk/vegastrike/Makefile.am
    trunk/vegastrike/configure.ac

Modified: trunk/vegastrike/Makefile.am
===================================================================
--- trunk/vegastrike/Makefile.am	2006-09-23 03:10:42 UTC (rev 10730)
+++ trunk/vegastrike/Makefile.am	2006-09-25 00:43:21 UTC (rev 10731)
@@ -770,7 +770,9 @@
   src/vsfilesystem.cpp \
   src/vsfilesystem.h \
   src/xml_support.cpp \
-  src/xml_support.h
+  src/xml_support.h \
+  src/SharedPool.cpp \
+  src/SharedPool.h
 
 vegastrike_CXXFLAGS = -DBISON
 vegastrike_SOURCES = \
@@ -1064,10 +1066,10 @@
     src/common/common.cpp \
     src/common/common.h
 
-src/cmd/script/c_alike/c_alike.tab.cpp: src/cmd/script/c_alike/c_alike.yacc
+#src/cmd/script/c_alike/c_alike.tab.cpp: src/cmd/script/c_alike/c_alike.yacc
 
-src/cmd/script/c_alike/lex.yy.cpp: src/cmd/script/c_alike/c_alike.lex
-	flex -o src/cmd/script/c_alike/lex.yy.cpp src/cmd/script/c_alike/c_alike.lex 
+#src/cmd/script/c_alike/lex.yy.cpp: src/cmd/script/c_alike/c_alike.lex
+#	flex -o src/cmd/script/c_alike/lex.yy.cpp src/cmd/script/c_alike/c_alike.lex 
 
 #The following is a way to get around the HUGE number of files that boost contains.
 dist-hook:

Modified: trunk/vegastrike/configure.ac
===================================================================
--- trunk/vegastrike/configure.ac	2006-09-23 03:10:42 UTC (rev 10730)
+++ trunk/vegastrike/configure.ac	2006-09-25 00:43:21 UTC (rev 10731)
@@ -14,9 +14,23 @@
 AC_PROG_CXXCPP
 dnl Install is used by make install
 AC_PROG_INSTALL
-dnl Lexx used for a parser we use
+
+dnl Lexx used to be used for a parser we use
+
+dnl dnl pmx - 22/09/2006
+dnl AC_CHECK_TOOL(BISON,bison)
+dnl dnl AS the converter code in src/cmd/script/c_alike relies on bison, 
+dnl dnl we MUST be sure to use flex in bison compatibility mode
+dnl dnl (instad of the traditional 'lex')  pmx - 23/sept./2006
+dnl AC_CHECK_TOOL(LEX, flex)
+dnl AC_SUBST(LFLAGS,"$LFLAGS --yylineno --bison-bridge")
+dnl AC_SUBST(FLIB,"-lfl")
+
+dnl Old lex tool:
 dnl AC_PROG_LEX
-AM_PROG_LEX
+dnl AM_PROG_LEX
+dnl Lex isn't used any more since the switch to Python.
+
 dnl We use some static libraries to make building this program easier.
 AC_PROG_RANLIB
 
@@ -352,8 +366,8 @@
 [AC_FATAL([MISSING script(s) from m4scripts directory.
 An easy way to get these scripts is to use ./bootstrap-sh to create configure.
 If you get the message and are running bootstrap-sh, that probably means that 
-the m4scripts directory does not exist.  If you are using CVS to get 
-vegastrike, change to vegastrike directory, type 'cvs update -P -d' and this 
+the m4scripts directory does not exist.  If you are using SVN to get 
+vegastrike, change to vegastrike directory, type 'svn update' and this 
 directory should be created.])])  
 m4_pattern_forbid([VS_CHECK_CRYPTO])