From 640684403327250392107f027e5cd2fb2c76f7d9 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 25 Apr 2019 13:43:22 +0300 Subject: autotools: fix audio and chamelium builds The commit introducing Chamelium audio tests and removing old audio tests doesn't update autotools files. This patch fixes it. Signed-off-by: Simon Ser Fixes: 311baff151f90c1db6f57ee9515216b4f9da5db7 Reviewed-by: Arkadiusz Hiler --- configure.ac | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a3f541a2..7467e620 100644 --- a/configure.ac +++ b/configure.ac @@ -150,6 +150,9 @@ PKG_CHECK_MODULES(PIXMAN, [pixman-1 >= 0.36.0], [], [ PKG_CHECK_MODULES(GSL, [gsl], [gsl=yes], [gsl=no]) AM_CONDITIONAL(HAVE_GSL, [test "x$gsl" = xyes]) +PKG_CHECK_MODULES(ALSA, [alsa], [alsa=yes], [alsa=no]) +AM_CONDITIONAL(HAVE_ALSA, [test "x$alsa" = xyes]) + # for chamelium AC_ARG_ENABLE(chamelium, AS_HELP_STRING([--enable-chamelium], [Enable building of chamelium libraries and tests (default: no)]), @@ -173,28 +176,11 @@ if test "x$enable_chamelium" = xyes; then if test x"$gsl" != xyes; then AC_MSG_ERROR([Failed to find gsl, required by chamelium.]) fi - - AC_DEFINE(HAVE_CHAMELIUM, 1, [Enable Chamelium support]) -fi - -PKG_CHECK_MODULES(ALSA, [alsa], [alsa=yes], [alsa=no]) -AM_CONDITIONAL(HAVE_ALSA, [test "x$alsa" = xyes]) - -# for audio -AC_ARG_ENABLE(audio, AS_HELP_STRING([--enable-audio], - [Enable building of audio tests (default: no)]), - [if test x$enableval = xyes; then enable_audio=yes; fi], - [enable_audio=no]) -AM_CONDITIONAL(HAVE_AUDIO, [test "x$enable_audio" = xyes]) -if test "x$enable_audio" = xyes; then if test x"$alsa" != xyes; then - AC_MSG_ERROR([Failed to find ALSA, required by audio.]) - fi - if test x"$gsl" != xyes; then - AC_MSG_ERROR([Failed to find gsl, required by audio.]) + AC_MSG_ERROR([Failed to find alsa, required by chamelium.]) fi - AC_DEFINE(HAVE_AUDIO, 1, [Enable Audio support]) + AC_DEFINE(HAVE_CHAMELIUM, 1, [Enable Chamelium support]) fi # ----------------------------------------------------------------------------- @@ -325,7 +311,6 @@ echo "" echo " • Tests:" echo " Build tests : ${BUILD_TESTS}" echo " Chamelium tests : ${enable_chamelium}" -echo " Audio tests : ${enable_audio}" echo " Compile prime tests: ${NOUVEAU}" echo " Debug flags : ${DEBUG_CFLAGS}" echo "" -- cgit v1.2.3