aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-06-08 21:00:23 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-06-08 21:15:09 +0900
commit4f6df6b7ca186420a88ea5215f84f5a8ecf2b4f0 (patch)
treeb97a682e8e4d383650f13de575d7f7761805d84b /configure.ac
parentfix leak in randr2 when matching clone modes (diff)
downloadenlightenment-4f6df6b7ca186420a88ea5215f84f5a8ecf2b4f0.tar.gz
e mixer - replace with epulse/emixer
this is emixer (epulse) from http://git.enlightenment.org/devs/ceolin/epulse.git the emixer binar is rewritten though and the emix lib is compiled-in into the module and into the binary as oppopsed to a shared lib with loadable modules. this supports alsa and pulse. a much more solid mixer.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac25
1 files changed, 5 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac
index 6b7afda56..3a59fcb5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -722,28 +722,13 @@ define([CHECK_MODULE_NOTIFICATION],
AM_CONDITIONAL(HAVE_ALSA, false)
+AM_CONDITIONAL(HAVE_PULSE, false)
define([CHECK_MODULE_MIXER],
[
- if test "x$enable_alsa" = "x" || test "x$enable_alsa" = "xdefault" || test "x$enable_alsa" = "xyes"; then
- AC_E_CHECK_PKG(ALSA, [alsa >= 1.0.8],
- [ SOUND_CFLAGS="$ALSA_CFLAGS -DHAVE_ALSA $SOUND_CFLAGS"
- SOUND_LIBS="$ALSA_LIBS $SOUND_LDFLAGS"
- ],
- [ if test "x$enable_alsa" = "xyes"; then
- AC_MSG_ERROR([alsa library >= 1.0.8 not found])
- else
- AC_MSG_WARN([alsa library development files not present. no alsa support.])
- fi
- ])
- else
- have_alsa=no
- fi
-
- if test "$have_alsa" = "yes"; then
- AC_DEFINE(HAVE_ALSA, 1, [Define if the ALSA output plugin should be built])
- else
- have_alsa=no
- fi
+ AC_E_CHECK_PKG(ALSA, [alsa >= 1.0.8],
+ [ ], [ ])
+ AC_E_CHECK_PKG([PULSE], [libpulse-simple libpulse],
+ [ ], [ ])
])
SHM_OPEN_LIBS=""