-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
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
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,
])
# 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
+])
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