xf86-video-intel: configure.ac
Chris Wilson
ickle at kemper.freedesktop.org
Fri Oct 11 03:07:04 PDT 2013
configure.ac | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
New commits:
commit e914dada5595a24b5d0fada7e476cc93570fa7c5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Oct 10 17:14:36 2013 +0100
configure: Allow manual specification of intel-gen4asm path
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index 45bd370..aa444a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,13 +97,26 @@ AC_ARG_ENABLE(gen4asm,
gen4asm=no
if test "x$ASM" != "xno"; then
- PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.2], [gen4asm=yes], [gen4asm=no])
- if test "x$ASM" = "xyes" -a "x$gen4asm" != "xyes"; then
- AC_MSG_ERROR([intel-gen4asm support requested but not found])
+ AC_ARG_WITH(gen4asm,
+ AS_HELP_STRING([--with-gen4asm=PATH],
+ [Path to intel-gen4asm binary]]]),
+ [path="$withval"],
+ [path=""])
+ if test -n "$path" ; then
+ gen4asm=yes
+ else
+ PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.2], [gen4asm=yes], [gen4asm=no])
+ if test "x$ASM" = "xyes" -a "x$gen4asm" != "xyes"; then
+ AC_MSG_ERROR([intel-gen4asm support requested but not found])
+ fi
fi
if test "x$gen4asm" = "xyes"; then
AC_MSG_CHECKING([path to use for intel-gen4asm])
- INTEL_GEN4ASM="`pkg-config intel-gen4asm --variable=exec_prefix`/bin/intel-gen4asm"
+ if test -n "$path" ; then
+ INTEL_GEN4ASM="$path"
+ else
+ INTEL_GEN4ASM="`pkg-config intel-gen4asm --variable=exec_prefix`/bin/intel-gen4asm"
+ fi
if ! test -e "$INTEL_GEN4ASM"; then
AC_MSG_ERROR([intel-gen4asm enabled, but not found. Tried '$INTEL_GEN4ASM'.])
fi
More information about the xorg-commit
mailing list