diff options
Diffstat (limited to 'mesalib/m4')
| -rw-r--r-- | mesalib/m4/ax_check_python_mako_module.m4 | 61 | ||||
| -rw-r--r-- | mesalib/m4/ax_prog_flex.m4 | 4 |
2 files changed, 63 insertions, 2 deletions
diff --git a/mesalib/m4/ax_check_python_mako_module.m4 b/mesalib/m4/ax_check_python_mako_module.m4 new file mode 100644 index 000000000..2fc029b9a --- /dev/null +++ b/mesalib/m4/ax_check_python_mako_module.m4 @@ -0,0 +1,61 @@ +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_PYTHON_MAKO_MODULE(MIN_VERSION_NUMBER) +# +# DESCRIPTION +# +# Check whether Python mako module is installed and its version higher than +# minimum requested. +# +# Example of its use: +# +# For example, the minimum mako version would be 0.7.3. Then configure.ac +# would contain: +# +# AX_CHECK_PYTHON_MAKO_MODULE(0.7.3) +# +# LICENSE +# +# Copyright (c) 2014 Intel Corporation. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +dnl macro that checks for mako module in python +AC_DEFUN([AX_CHECK_PYTHON_MAKO_MODULE], +[AC_MSG_CHECKING(if module mako in python is installed) + echo " +try: + import sys + import mako +except ImportError as err: + sys.exit(err) +else: + ver_req = map(int, '$1'.split('.')) + ver_act = map(int, mako.__version__.split('.')) + sys.exit(int(ver_req > ver_act)) + " | $PYTHON2 - + + if test $? -ne 0 ; then + AC_MSG_ERROR(mako $1 or later is required.) + else + AC_MSG_RESULT(yes) + fi +]) diff --git a/mesalib/m4/ax_prog_flex.m4 b/mesalib/m4/ax_prog_flex.m4 index 82fbc30c3..1f1f59776 100644 --- a/mesalib/m4/ax_prog_flex.m4 +++ b/mesalib/m4/ax_prog_flex.m4 @@ -42,7 +42,7 @@ # 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 +#serial 12 # mattst88: # Replaced m4_ifnblank(...) with m4_ifval(m4_normalize(...), ...) @@ -53,7 +53,7 @@ AC_DEFUN([AX_PROG_FLEX], [ 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\>'], + AS_IF([$LEX --version 2>/dev/null | $EGREP -qw '^g?flex'], [ax_cv_prog_flex=yes], [ax_cv_prog_flex=no]) ]) AS_IF([test "$ax_cv_prog_flex" = "yes"], |