From: Emil Velikov <emil.veli...@collabora.com>
Otherwise we get annoying messages like the following when xxd is
missing.
/bin/sh: line 2: -i: command not found
Cc: mesa-sta...@lists.freedesktop.org
Cc: Lionel Landwerlin <lionel.g.landwer...@intel.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
I'm wondering if we shouldn't give some form or warning/error message
when xxd is missing ? Either way, this is a good step forward imho.
---
configure.ac | 2 +-
src/intel/Makefile.genxml.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index d215b63..e7cfb50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,7 @@ LT_PREREQ([2.2])
LT_INIT([disable-static])
AC_CHECK_PROG(RM, rm, [rm -f])
-AC_CHECK_PROG(XXD, xxd, [xxd])
+AC_CHECK_PROG(XXD, xxd, [xxd -i])
AX_PROG_BISON([],
AS_IF([test ! -f
"$srcdir/src/compiler/glsl/glcpp/glcpp-parse.c"],
diff --git a/src/intel/Makefile.genxml.am b/src/intel/Makefile.genxml.am
index 2df223a..f998011 100644
--- a/src/intel/Makefile.genxml.am
+++ b/src/intel/Makefile.genxml.am
@@ -45,7 +45,7 @@ $(GENXML_GENERATED_FILES): Makefile
$(MKDIR_GEN)
$(AM_V_GEN) echo -n "static const uint8_t " > $@; \
echo "$(@F)_xml[] = {" | sed -e 's,_xml.h,,' >> $@; \
- cat $< | $(XXD) -i >> $@; \
+ cat $< | $(XXD) >> $@; \
echo "};" >> $@
EXTRA_DIST += \
--
2.9.3
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
