diff options
author | Russell King <rmk@arm.linux.org.uk> | 2016-01-06 20:34:25 +0000 |
---|---|---|
committer | Russell King <rmk@arm.linux.org.uk> | 2016-01-06 20:34:25 +0000 |
commit | bb978f5326b6c6c9d6d6267624f5de7325e962a1 (patch) | |
tree | 30fac67b7909b5f70e7c4e2b74e28ed2fa609dd1 | |
parent | d69afc49b3183027c29bf12735c4228ce9c6a1f2 (diff) |
build: don't error out on missing etnaviv functions
Don't error out when on missing libetnaviv functions when etnaviv
support is explicitly disabled. This allows building etnadrm
support with only the etnaviv source present.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
-rw-r--r-- | configure.ac | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index a489334..38f66ff 100644 --- a/configure.ac +++ b/configure.ac @@ -176,12 +176,15 @@ AS_IF([test x$ACCEL_ETNAVIV != xno || test x$ACCEL_ETNADRM != xno], [AS_IF([test x$ACCEL_ETNAVIV = xauto], [ACCEL_ETNAVIV=yes]) AS_IF([test x$ACCEL_ETNADRM = xauto], [ACCEL_ETNADRM=yes])], [ACCEL_ETNAVIV=no ACCEL_ETNADRM=no]) - AC_CHECK_LIB([etnaviv], [etna_bo_from_dmabuf], - [DUMMY=y], - [AC_MSG_ERROR([etnaviv support requires etna_bo_from_dmabuf()])]) - AC_CHECK_LIB([etnaviv], [etna_bo_from_usermem_prot], - [DUMMY=y], - [AC_MSG_ERROR([etnaviv support requires etna_bo_from_usermem_prot()])]) + AS_IF([test x$ACCEL_ETNAVIV != xno], + [ + AC_CHECK_LIB([etnaviv], [etna_bo_from_dmabuf], + [DUMMY=y], + [AC_MSG_ERROR([etnaviv support requires etna_bo_from_dmabuf()])]) + AC_CHECK_LIB([etnaviv], [etna_bo_from_usermem_prot], + [DUMMY=y], + [AC_MSG_ERROR([etnaviv support requires etna_bo_from_usermem_prot()])]) + ]) LDFLAGS="$saved_LDFLAGS" CFLAGS="$saved_CFLAGS" AS_IF([test x$PKGCFG_ETNAVIV != xyes], [ETNAVIV_LIBS+=" -letnaviv"]) |