summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2012-10-01 13:28:51 -0700
committerMatt Turner <mattst88@gmail.com>2013-01-22 14:33:38 -0800
commit2a710543968b6710368d53dbff350d2d23e08268 (patch)
tree4f523022064ef6b79c20e01ce5e46c9a2a4e81fd
parentb68b85224d38fe9c1f6e10af338e1ff2519e689b (diff)
build: Use AX_PROG_FLEX
Tested-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Eric Anholt <eric@anholt.net> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47248
-rw-r--r--configure.ac4
-rw-r--r--m4/ax_prog_flex.m463
2 files changed, 66 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 70599e1d33e..e769edadb78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,9 @@ LT_INIT([disable-static])
AX_PROG_BISON([],
AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"]
[AC_MSG_ERROR([bison not found - unable to compile glcpp-parse.y])]))
-AC_PROG_LEX
+AX_PROG_FLEX([],
+ AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-lex.c"]
+ [AC_MSG_ERROR([flex not found - unable to compile glcpp-lex.l])]))
AC_PATH_PROG([PERL], [perl])
diff --git a/m4/ax_prog_flex.m4 b/m4/ax_prog_flex.m4
new file mode 100644
index 00000000000..117f8fe6755
--- /dev/null
+++ b/m4/ax_prog_flex.m4
@@ -0,0 +1,63 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_prog_flex.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_PROG_FLEX(ACTION-IF-TRUE,ACTION-IF-FALSE)
+#
+# DESCRIPTION
+#
+# Check whether flex is the scanner generator. Run ACTION-IF-TRUE if
+# successful, ACTION-IF-FALSE otherwise
+#
+# LICENSE
+#
+# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net>
+# Copyright (c) 2010 Diego Elio Petteno` <flameeyes@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.
+
+#serial 9
+
+# mattst88:
+# Replaced m4_ifnblank(...) with m4_ifval(m4_normalize(...), ...)
+# since m4_ifnblank requires autoconf-2.64.
+
+AC_DEFUN([AX_PROG_FLEX], [
+ AC_REQUIRE([AM_PROG_LEX])
+ AC_REQUIRE([AC_PROG_EGREP])
+
+ AC_CACHE_CHECK([if flex is the lexer generator],[ax_cv_prog_flex],[
+ AS_IF([$LEX --version 2>/dev/null | $EGREP -q '^flex '],
+ [ax_cv_prog_flex=yes], [ax_cv_prog_flex=no])
+ ])
+ AS_IF([test "$ax_cv_prog_flex" = "yes"],
+ m4_ifval(m4_normalize([$1]), [[$1]]),
+ m4_ifval(m4_normalize([$2]), [[$2]])
+ )
+])