Mesa (master): configure: add check for GNU indent
Iago Toral Quiroga
itoral at kemper.freedesktop.org
Wed Jan 14 11:54:37 UTC 2015
Module: Mesa
Branch: master
Commit: efef6c828092702b1f928f98d15fb90b4544a85c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=efef6c828092702b1f928f98d15fb90b4544a85c
Author: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Date: Tue Jan 13 11:02:27 2015 +0100
configure: add check for GNU indent
Only GNU indent is supported when indenting autogenerated format_pack.c
and format_unpack.c files. Some non-GNU indent (Mac OS X and FreeBSD)
add extra whitespaces than break the build of those files.
Fallback to 'cat' if a non-GNU indent is found.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88335
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Tested-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
configure.ac | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 3c614ea..c72fe92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,13 @@ AX_PROG_FLEX([],
AC_CHECK_PROG(INDENT, indent, indent, cat)
if test "x$INDENT" != "xcat"; then
- AC_SUBST(INDENT_FLAGS, '-i4 -nut -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool')
+ # Only GNU indent is supported
+ INDENT_VERSION=`indent --version | grep GNU`
+ if test $? -eq 0; then
+ AC_SUBST(INDENT_FLAGS, '-i4 -nut -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool')
+ else
+ INDENT="cat"
+ fi
fi
AX_CHECK_PYTHON_MAKO_MODULE(0.3.4)
More information about the mesa-commit
mailing list