| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 1 | From e6bd4205b0b546afe991ae6f72256645f4404ad4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Mon, 5 Sep 2016 14:41:37 +0300 |
| 4 | Subject: [PATCH libdrm] configure.ac: Allow explicit enabling of cunit tests |
| 5 | |
| 6 | Add --with-cunit to make it easier to do reproducible builds. Default |
| 7 | is still to probe cunit and build opportunistically. |
| 8 | |
| 9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 10 | Upstream-Status: Submitted [mailing list] |
| 11 | --- |
| 12 | configure.ac | 14 ++++++++++++-- |
| 13 | 1 file changed, 12 insertions(+), 2 deletions(-) |
| 14 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 15 | Index: libdrm-2.4.91/configure.ac |
| 16 | =================================================================== |
| 17 | --- libdrm-2.4.91.orig/configure.ac |
| 18 | +++ libdrm-2.4.91/configure.ac |
| 19 | @@ -163,6 +163,12 @@ AC_ARG_ENABLE(install-test-programs, |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 20 | [Install test programs (default: no)]), |
| 21 | [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no]) |
| 22 | |
| 23 | +AC_ARG_WITH([cunit], |
| 24 | + [AS_HELP_STRING([--with-cunit], |
| 25 | + [Build tests that use cunit (default: auto)])], |
| 26 | + [], |
| 27 | + [with_cunit=auto]) |
| 28 | + |
| 29 | dnl =========================================================================== |
| 30 | dnl check compiler flags |
| 31 | AC_DEFUN([LIBDRM_CC_TRY_FLAG], [ |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 32 | @@ -411,7 +417,7 @@ else |
| 33 | AC_DEFINE(HAVE_RADEON, 0) |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 34 | fi |
| 35 | |
| 36 | -if test "x$AMDGPU" != xno; then |
| 37 | +if test "x$with_cunit" != xno -a "x$AMDGPU" != xno; then |
| 38 | # Detect cunit library |
| 39 | PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) |
| 40 | # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 41 | @@ -436,7 +442,11 @@ if test "x$AMDGPU" = xyes; then |
| 42 | AC_DEFINE(HAVE_AMDGPU, 1, [Have amdgpu support]) |
| Patrick Williams | c0f7c04 | 2017-02-23 20:41:17 -0600 | [diff] [blame] | 43 | |
| 44 | if test "x$have_cunit" = "xno"; then |
| 45 | - AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) |
| 46 | + if test "x$with_cunit" = "xyes"; then |
| 47 | + AC_MSG_ERROR([Could not find cunit library but --with-cunit was given]) |
| 48 | + elif test "x$with_cunit" = "xauto"; then |
| 49 | + AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) |
| 50 | + fi |
| 51 | fi |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 52 | else |
| 53 | AC_DEFINE(HAVE_AMDGPU, 0) |