From: sof <unknown>
Date: Sun, 27 May 2001 05:00:08 +0000 (+0000)
Subject: [project @ 2001-05-27 05:00:08 by sof]
X-Git-Tag: Approximately_9120_patches~1863
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=72efdb49a4f3562d2d4dd11792f5ca09db249162;p=ghc-hetmet.git

[project @ 2001-05-27 05:00:08 by sof]
'flex' or 'lex' is required to compile up fptools/ (e.g., reqd in
glafp-utils/sgmlverb). autoconf's standard macro AC_PROG_LEX just
defaults to 'lex' if 'flex' isn't found, but doesn't actually
check whether 'lex' is available along PATH.

Added AC_PROG_LEX_STRICT, which extends AC_PROG_LEX by checking
for the presence of 'lex' if 'flex' isn't found. It bails
out with an error message if 'lex' cannot be found.
---

diff --git a/aclocal.m4 b/aclocal.m4
index 7376f3a..aa3bc3f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.72 2001/05/25 13:56:25 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.73 2001/05/27 05:00:08 sof Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -891,7 +891,7 @@ dnl The variable LIBM (which is not an output variable by default) is
 dnl set to a value which is suitable for use in a Makefile (for example,
 dnl in make's LOADLIBES macro) provided you AC_SUBST it first.
 dnl
-dnl @version 0.01 $Id: aclocal.m4,v 1.72 2001/05/25 13:56:25 simonmar Exp $
+dnl @version 0.01 $Id: aclocal.m4,v 1.73 2001/05/27 05:00:08 sof Exp $
 dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
 
 # FPTOOLS_CHECK_LIBM - check for math library
@@ -979,7 +979,7 @@ dnl Please note that as the ac_opengl macro and the toy example evolves,
 dnl the version number increases, so you may have to adjust the above
 dnl URL accordingly.
 dnl
-dnl @version 0.01 $Id: aclocal.m4,v 1.72 2001/05/25 13:56:25 simonmar Exp $
+dnl @version 0.01 $Id: aclocal.m4,v 1.73 2001/05/27 05:00:08 sof Exp $
 dnl @author Matthew D. Langston <langston@SLAC.Stanford.EDU>
 
 AC_DEFUN(FPTOOLS_HAVE_OPENGL,
@@ -1052,3 +1052,17 @@ dnl and we don't want to be global namespace polluters.
 ])
 
 # LocalWords:  fi
+
+dnl 
+dnl acspecific.m4's defn of AC_PROG_LEX is a bit too permissive, as it
+dnl defaults to 'lex' if 'flex' isn't found (without checking whether
+dnl 'lex' is actually present along the user's PATH).
+dnl
+AC_DEFUN(AC_PROG_LEX_STRICT,
+[AC_CHECK_PROG(LEX, flex, flex)
+if test -z "$LEX"
+then
+  AC_CHECK_PROG(LEX,lex,lex)
+  test -z "$LEX" && AC_MSG_ERROR(['lex' or 'flex' is required to compile GHC.])
+fi
+])
diff --git a/configure.in b/configure.in
index ed320f1..91bd161 100644
--- a/configure.in
+++ b/configure.in
@@ -528,10 +528,10 @@ dnl (FPTOOLS_PROG_YACCY is AC_PROG_YACC, but with some extra testing
 dnl  on the suitability of the 'yacc' returned.)
 FPTOOLS_PROG_YACCY
 
-dnl ** Find lex command (lex or flex) and library (-ll or -lfl)
-dnl     ( not that we care about the latter, see mk/config.mk.in )
-AC_PROG_LEX
-
+dnl ** Find lex command (lex or flex) - *doesn't* use autoconf's
+dnl    AC_PROG_LEX, since it doesn't actually check whether 'lex'
+dnl    exists if 'flex' doesn't.
+AC_PROG_LEX_STRICT
 
 dnl ** figure out how to do a BSD-ish install
 AC_PROG_INSTALL