Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
savoirfairelinux
jami-daemon
Commits
2f471980
Commit
2f471980
authored
Aug 06, 2012
by
Alexandre Savard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#14379: Make alsa an optional feature at compile time
parent
d086c28c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
daemon/configure.ac
daemon/configure.ac
+11
-2
daemon/src/audio/Makefile.am
daemon/src/audio/Makefile.am
+9
-1
daemon/src/audio/alsa/Makefile.am
daemon/src/audio/alsa/Makefile.am
+3
-0
No files found.
daemon/configure.ac
View file @
2f471980
...
...
@@ -102,7 +102,16 @@ PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= ${LIBCRYPTO_MIN_VERSION}, HAVE_LIBCRYP
dnl Check for alsa development package - name: libasound2-dev
ALSA_MIN_VERSION=1.0
PKG_CHECK_MODULES(ALSA, alsa >= ${ALSA_MIN_VERSION},, AC_MSG_ERROR([Missing alsa development package: libasound2-dev or alsa-lib-devel]))
AC_ARG_WITH([alsa],
[ AS_HELP_STRING([--without-alsa], [disable support for alsa]) ],
[],
[with_alsa=yes])
AS_IF([test "x$with_alsa" = "xyes"], [
PKG_CHECK_MODULES(ALSA, alsa >= ${ALSA_MIN_VERSION},, AC_MSG_ERROR([Missing alsa development package: libasound2-dev or alsa-lib-devel]))
]);
AC_DEFINE_UNQUOTED([HAVE_ALSA], `if test "x$with_alsa" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have alsa])
AM_CONDITIONAL(BUILD_ALSA, test "x$with_alsa" = "xyes")
dnl Check for pulseaudio development package - name: libpulse-dev
LIBPULSE_MIN_VERSION=0.9.15
...
...
@@ -115,7 +124,7 @@ AS_IF([test "x$with_pulse" = "xyes"], [
]);
AC_DEFINE_UNQUOTED([HAVE_PULSE], `if test "x$with_pulse" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have pulseaudio])
AM_CONDITIONAL(BUILD_PULSE, test "x$with_pulse" = "xyes"
)
AM_CONDITIONAL(BUILD_PULSE, test "x$with_pulse" = "xyes")
dnl Check for the samplerate development package - name: libsamplerate0-dev
LIBSAMPLERATE_MIN_VERSION=0.1.2
...
...
daemon/src/audio/Makefile.am
View file @
2f471980
...
...
@@ -2,7 +2,11 @@ include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES
=
libaudio.la
SUBDIRS
=
codecs audiortp sound alsa
SUBDIRS
=
codecs audiortp sound
if
BUILD_ALSA
SUBDIRS
+=
alsa
endif
if
BUILD_PULSE
SUBDIRS
+=
pulseaudio
...
...
@@ -50,3 +54,7 @@ libaudio_la_LIBADD = \
if
BUILD_PULSE
libaudio_la_LIBADD
+=
./pulseaudio/libpulselayer.la
endif
if
BUILD_ALSA
libaudio_la_LIBADD
+=
./alsaaudio/libaudiolayer.la
endif
daemon/src/audio/alsa/Makefile.am
View file @
2f471980
include
$(top_srcdir)/globals.mak
if
BUILD_ALSA
noinst_LTLIBRARIES
=
libalsalayer.la
libalsalayer_la_SOURCES
=
alsalayer.cpp
noinst_HEADERS
=
alsalayer.h
endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment