[Crossfire-cvs] SF.net SVN: crossfire:[19974] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 19974
          http://sourceforge.net/p/crossfire/code/19974
Author:   silvernexus
Date:     2015-05-25 20:04:05 +0000 (Mon, 25 May 2015)
Log Message:
-----------
Fix bug #809 -- Server: configure doesn't check for flex.

Modified Paths:
--------------
    server/trunk/ChangeLog
    server/trunk/configure.ac

Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog	2015-05-25 09:23:04 UTC (rev 19973)
+++ server/trunk/ChangeLog	2015-05-25 20:04:05 UTC (rev 19974)
@@ -1,3 +1,6 @@
+2015-05-25  Daniel Hawkins
+	* configure.ac: Made the configure script exit if lex and flex are not found.
+
 2015-05-24  Daniel Hawkins
 	* common/living.c: Fixed a bug in which the player's experience would
 	  endlessly loop in the level below maxlevel.

Modified: server/trunk/configure.ac
===================================================================
--- server/trunk/configure.ac	2015-05-25 09:23:04 UTC (rev 19973)
+++ server/trunk/configure.ac	2015-05-25 20:04:05 UTC (rev 19974)
@@ -48,8 +48,20 @@
 AC_PROG_AWK
 AC_PROG_CC_C99
 AC_PROG_LIBTOOL
-AM_PROG_LEX
+AC_PROG_LEX
 
+# If no lexical parser is found, $LEX is set to ":".
+# Check for that so we can exit if lex and flex are not found.
+#
+# -- Daniel Hawkins 2015-05-25
+
+if test $LEX == ':'; then
+    AC_MSG_NOTICE([])
+    AC_MSG_NOTICE([Lexical parser flex is missing.])
+    AC_MSG_NOTICE([Install flex to proceed with configuration.])
+    exit
+fi
+
 AC_PATH_PROG(BASENAME, basename)
 AC_PATH_PROG(BZIP, bzip2)
 AC_PATH_PROG(GZIP, gzip)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.