From 2224fb6047dd96cbc11d7f2093319e5eb49c0b6b Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 29 May 2012 16:03:05 -0700 Subject: [PATCH] automake: Check for 'indent' and fall back to 'cat' if not found. The glapi generator code uses indent to produce more readable code. However, we don't want to make GNU indent a hard build dependency; check for it in configure.ac and fall back to 'cat' if it's not available. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50484 Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner Acked-by: Ben Widawsky --- configs/autoconf.in | 4 ++++ configure.ac | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/configs/autoconf.in b/configs/autoconf.in index 38f49a2..2a111c7 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -64,6 +64,10 @@ NM = @NM@ # Perl PERL = @PERL@ +# Indent (used for generating dispatch tables) +INDENT = @INDENT@ +INDENT_FLAGS = @INDENT_FLAGS@ + # Python and flags (generally only needed by the developers) PYTHON2 = @PYTHON2@ PYTHON_FLAGS = -t -O -O diff --git a/configure.ac b/configure.ac index 20bd00b..9fb8149 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,11 @@ AC_PROG_LEX AC_PATH_PROG([PERL], [perl]) +AC_CHECK_PROG(INDENT, indent, indent, cat) +if test "x$INDENT" != "xcat"; then + AC_SUBST(INDENT_FLAGS, '-i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool') +fi + dnl Our fallback install-sh is a symlink to minstall. Use the existing dnl configuration in that case. AC_PROG_INSTALL -- 2.7.4