diff options
| author | Russell King <rmk@armlinux.org.uk> | 2017-02-11 13:13:27 +0000 |
|---|---|---|
| committer | Russell King <rmk@armlinux.org.uk> | 2017-02-11 17:21:04 +0000 |
| commit | c7538a8d6eb3aeddec6e68dff5d30168a01f5193 (patch) | |
| tree | 760aa296dea0a9f4c44afce4aaf9a04ecd6c572c | |
| parent | fc12661c74819266f7c497ea04540cfb24760e07 (diff) | |
build: cater for laanwj's etna_viv change
Allow for etna_viv commit "3dadcdd Move almost everything under src/
to attic/", which moved the libetnaviv source code into attic.
Signed-off-by: Russell King <rmk@armlinux.org.uk>
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 38f66ff..a31fd39 100644 --- a/configure.ac +++ b/configure.ac @@ -155,8 +155,24 @@ AS_IF([test x$ACCEL_ETNAVIV != xno || test x$ACCEL_ETNADRM != xno], [ AS_IF([test x$etnaviv_source != x], [ - ETNAVIV_CFLAGS="-I$etnaviv_source/src" - ETNAVIV_LIBS="-L$etnaviv_source/src/etnaviv" + AC_MSG_CHECKING([location of etnaviv hardware headers]) + AS_IF([test -f "$etnaviv_source/src/etnaviv/common.xml.h"], + [libetnaviv_includes="$etnaviv_source/src"], + [AC_MSG_ERROR([Could not find libetnaviv hardware headers])]) + AC_MSG_RESULT([$libetnaviv_includes]) + AC_MSG_CHECKING([location of libetnaviv source tree]) + AS_IF([test -f "$etnaviv_source/src/etnaviv/etna.h"], + [libetnaviv_source="$etnaviv_source/src"], + [ + AS_IF([test -f "$etnaviv_source/attic/etnaviv/etna.h"], + [libetnaviv_source="$etnaviv_source/attic"], + [ + AC_MSG_ERROR([Could not find libetnaviv source within $etnaviv_source]) + ]) + ]) + ETNAVIV_CFLAGS="-I$libetnaviv_source -I$libetnaviv_includes" + ETNAVIV_LIBS="-L$libetnaviv_source/etnaviv" + AC_MSG_RESULT([$libetnaviv_source]) ], [ AS_IF([test x$etnaviv_include = x], |