mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'flameeyes/buildfixes-2'

Browse source
This commit is contained in:
Lennart Poettering 2009-01-20 00:55:36 +01:00
commit 47a2f9e3da
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -101,6 +101,12 @@ for flag in $DESIRED_FLAGS ; do
CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"]) CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"])
done done
dnl Check whether to build tests by default (as compile-test) or not
AC_ARG_ENABLE([default-build-tests],
AS_HELP_STRING([--disable-default-build-tests], [Build test programs only during make check]))
AM_CONDITIONAL([BUILD_TESTS_DEFAULT], [test "x$enable_default_build_tests" = "xno"])
# Native atomic operation support # Native atomic operation support
AC_ARG_ENABLE([atomic-arm-linux-helpers], AC_ARG_ENABLE([atomic-arm-linux-helpers],
AS_HELP_STRING([--disable-atomic-arm-linux-helpers],[use inline asm or libatomic_ops instead]), AS_HELP_STRING([--disable-atomic-arm-linux-helpers],[use inline asm or libatomic_ops instead]),

14
src/Makefile.am
View file

@ -56,6 +56,8 @@ AM_CFLAGS = \
-I$(top_builddir)/src/modules/gconf \ -I$(top_builddir)/src/modules/gconf \
-I$(top_srcdir)/src/modules/bluetooth \ -I$(top_srcdir)/src/modules/bluetooth \
-I$(top_builddir)/src/modules/bluetooth \ -I$(top_builddir)/src/modules/bluetooth \
-I$(top_srcdir)/src/modules/alsa \
-I$(top_builddir)/src/modules/alsa \
-I$(top_srcdir)/src/modules/raop \ -I$(top_srcdir)/src/modules/raop \
$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \ $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
$(LTDLINCL) \ $(LTDLINCL) \
@ -253,7 +255,7 @@ TESTS = \
lock-autospawn-test \ lock-autospawn-test \
prioq-test prioq-test
noinst_PROGRAMS = \ TESTS_BINARIES = \
mainloop-test \ mainloop-test \
mcalign-test \ mcalign-test \
pacat-simple \ pacat-simple \
@ -293,7 +295,7 @@ if HAVE_SIGXCPU
#TESTS += \ #TESTS += \
# cpulimit-test \ # cpulimit-test \
# cpulimit-test2 # cpulimit-test2
noinst_PROGRAMS += \ TESTS_BINARIES += \
cpulimit-test \ cpulimit-test \
cpulimit-test2 cpulimit-test2
endif endif
@ -301,10 +303,16 @@ endif
if HAVE_GLIB20 if HAVE_GLIB20
TESTS += \ TESTS += \
mainloop-test-glib mainloop-test-glib
noinst_PROGRAMS += \ TESTS_BINARIES += \
mainloop-test-glib mainloop-test-glib
endif endif
if BUILD_TESTS_DEFAULT
noinst_PROGRAMS = $(TESTS_BINARIES)
else
check_PROGRAMS = $(TESTS_BINARIES)
endif
mainloop_test_SOURCES = tests/mainloop-test.c mainloop_test_SOURCES = tests/mainloop-test.c
mainloop_test_CFLAGS = $(AM_CFLAGS) mainloop_test_CFLAGS = $(AM_CFLAGS)
mainloop_test_LDADD = $(AM_LDADD) libpulse.la mainloop_test_LDADD = $(AM_LDADD) libpulse.la