mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-15 08:56:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system: Small fixes

Browse source
This commit is contained in:
Maarten Bosmans 2011-04-30 15:25:55 +02:00 • committed by Colin Guthrie
parent 155f2d5b9d
commit eea248e233
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
configure.ac
View file

@ -382,7 +382,6 @@ AM_CONDITIONAL(HAVE_AF_UNIX, test "x$HAVE_AF_UNIX" = "x1")
# Linux # Linux
AC_CHECK_HEADERS([linux/input.h], [HAVE_EVDEV=1], [HAVE_EVDEV=0]) AC_CHECK_HEADERS([linux/input.h], [HAVE_EVDEV=1], [HAVE_EVDEV=0])
AM_CONDITIONAL([HAVE_EVDEV], [test "x$HAVE_EVDEV" = "x1"]) AM_CONDITIONAL([HAVE_EVDEV], [test "x$HAVE_EVDEV" = "x1"])
AC_CHECK_HEADERS_ONCE([sys/prctl.h]) AC_CHECK_HEADERS_ONCE([sys/prctl.h])
@ -452,12 +451,6 @@ AC_SEARCH_LIBS([pthread_setname_np], [pthread])
AC_SEARCH_LIBS([connect], [socket]) AC_SEARCH_LIBS([connect], [socket])
AC_SEARCH_LIBS([backtrace], [execinfo]) AC_SEARCH_LIBS([backtrace], [execinfo])
# Non-standard
# This magic is needed so we do not needlessly add static libs to the win32
# build, disabling its ability to make dlls.
AC_CHECK_FUNCS([getopt_long], [], [AC_CHECK_LIB([iberty], [getopt_long])])
# Darwin/OS X # Darwin/OS X
if test "x$os_is_darwin" = "x1" ; then if test "x$os_is_darwin" = "x1" ; then
AC_MSG_CHECKING([looking for Apple CoreService Framework]) AC_MSG_CHECKING([looking for Apple CoreService Framework])
@ -474,7 +467,10 @@ fi
AC_SUBST(HAVE_BONJOUR) AC_SUBST(HAVE_BONJOUR)
AM_CONDITIONAL([HAVE_BONJOUR], [test "x$HAVE_BONJOUR" = x1]) AM_CONDITIONAL([HAVE_BONJOUR], [test "x$HAVE_BONJOUR" = x1])
# Windows
AC_SEARCH_LIBS([regexec], [pcreposix]) AC_SEARCH_LIBS([regexec], [pcreposix])
# This magic is needed so we do not needlessly add static libs to the win32 build, disabling its ability to make dlls.
AC_CHECK_FUNCS([getopt_long], [], [AC_CHECK_LIB([iberty], [getopt_long])])
#### Check for functions #### #### Check for functions ####
@ -1022,7 +1018,7 @@ AC_SUBST(HAVE_DBUS)
AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1]) AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.])) AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))
# udev and HAL depend on D-Bus: So double check if they were explicitly enabled. # HAL and BlueZ depend on D-Bus: So double check if they were explicitly enabled.
if test "x$HAVE_DBUS" != "x1" ; then if test "x$HAVE_DBUS" != "x1" ; then
HAVE_HAL=0 HAVE_HAL=0
if test "x$enable_hal" = "xyes"; then if test "x$enable_hal" = "xyes"; then
@ -1035,7 +1031,6 @@ if test "x$HAVE_DBUS" != "x1" ; then
fi fi
fi fi
#### HAL compat support (optional) #### #### HAL compat support (optional) ####
AC_ARG_ENABLE([hal-compat], AC_ARG_ENABLE([hal-compat],
@ -1268,11 +1263,11 @@ echo "
CFLAGS: ${CFLAGS} CFLAGS: ${CFLAGS}
LIBS: ${LIBS} LIBS: ${LIBS}
Have X11: ${ENABLE_X11} Enable X11: ${ENABLE_X11}
Enable OSS Output: ${ENABLE_OSS_OUTPUT} Enable OSS Output: ${ENABLE_OSS_OUTPUT}
Enable OSS Wrapper: ${ENABLE_OSS_WRAPPER} Enable OSS Wrapper: ${ENABLE_OSS_WRAPPER}
Enable CoreAudio: ${ENABLE_COREAUDIO}
Enable Alsa: ${ENABLE_ALSA} Enable Alsa: ${ENABLE_ALSA}
Enable CoreAudio: ${ENABLE_COREAUDIO}
Enable Solaris: ${ENABLE_SOLARIS} Enable Solaris: ${ENABLE_SOLARIS}
Enable WaveOut: ${ENABLE_WAVEOUT} Enable WaveOut: ${ENABLE_WAVEOUT}
Enable GLib 2.0: ${ENABLE_GLIB20} Enable GLib 2.0: ${ENABLE_GLIB20}
@ -1291,11 +1286,12 @@ echo "
Enable libsamplerate: ${ENABLE_LIBSAMPLERATE} Enable libsamplerate: ${ENABLE_LIBSAMPLERATE}
Enable IPv6: ${ENABLE_IPV6} Enable IPv6: ${ENABLE_IPV6}
Enable OpenSSL (for Airtunes): ${ENABLE_OPENSSL} Enable OpenSSL (for Airtunes): ${ENABLE_OPENSSL}
Enable tdb: ${ENABLE_TDB}
Enable gdbm: ${ENABLE_GDBM}
Enable simple database: ${ENABLE_SIMPLEDB}
Enable fftw: ${ENABLE_FFTW} Enable fftw: ${ENABLE_FFTW}
Enable orc: ${ENABLE_ORC} Enable orc: ${ENABLE_ORC}
Database
tdb: ${ENABLE_TDB}
gdbm: ${ENABLE_GDBM}
simple database: ${ENABLE_SIMPLEDB}
System User: ${PA_SYSTEM_USER} System User: ${PA_SYSTEM_USER}
System Group: ${PA_SYSTEM_GROUP} System Group: ${PA_SYSTEM_GROUP}