aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Willmann <d.willmann@samsung.com>2013-04-19 16:16:34 +0100
committerDaniel Willmann <d.willmann@samsung.com>2013-04-19 16:16:34 +0100
commit94ae0e906d0d4a4e17d0ca7f3978e469b473fb18 (patch)
treea57fe620901b05cd14b8999cc5ca6d1675f0e656
parentecore_audio test: Better test coverage for inputs (diff)
downloadefl-94ae0e906d0d4a4e17d0ca7f3978e469b473fb18.tar.gz
ecore_audio: Don't fail configure with --disable-audio
Who knew I should test all these different possibilities... Signed-off-by: Daniel Willmann <d.willmann@samsung.com>
-rw-r--r--configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 9a31d50fe8..261a31d66d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2442,9 +2442,6 @@ EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_alsa}], [ALSA], [alsa])
EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_pulseaudio}], [PULSE], [libpulse])
EFL_OPTIONAL_DEPEND_PKG([ECORE_AUDIO], [${want_sndfile}], [SNDFILE], [sndfile])
-AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "${want_pulseaudio}" = "yes"])
-AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "${want_sndfile}" = "yes"])
-
EFL_EVAL_PKGS([ECORE_AUDIO])
EFL_ADD_FEATURE([ECORE_AUDIO], [alsa])
@@ -2464,6 +2461,9 @@ EFL_ADD_FEATURE([ECORE_AUDIO], [sndfile])
### Checks for library functions
EFL_LIB_END_OPTIONAL([Ecore_Audio])
+AM_CONDITIONAL([HAVE_ECORE_AUDIO_PULSE], [test "x${want_pulseaudio}" = "xyes"])
+AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"])
+
#### End of Ecore_Audio
#### Ecore_Win32