Give module-waveout a configure switch

- Also disable the scary DBus and udev warnings when building for win32
 - and only install some dbus/x11 specific files when appropriate
This commit is contained in:
Maarten Bosmans 2011-02-17 11:28:54 +01:00
parent 110b14ec21
commit f2a9fd779e
2 changed files with 48 additions and 5 deletions

View file

@ -878,6 +878,39 @@ fi
AC_SUBST(HAVE_SOLARIS) AC_SUBST(HAVE_SOLARIS)
AM_CONDITIONAL([HAVE_SOLARIS], [test "x$HAVE_SOLARIS" = x1]) AM_CONDITIONAL([HAVE_SOLARIS], [test "x$HAVE_SOLARIS" = x1])
#### WaveOut audio support (optional) ####
AC_ARG_ENABLE([waveout],
AS_HELP_STRING([--disable-waveout],[Disable optional WaveOut audio support]),
[
case "${enableval}" in
yes) waveout=yes ;;
no) waveout=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-waveout) ;;
esac
],
[waveout=auto])
if test "x${waveout}" != xno ; then
AC_CHECK_HEADERS([mmsystem.h],
[
HAVE_WAVEOUT=1
AC_DEFINE([HAVE_WAVEOUT], 1, [Have WaveOut audio?])
],
[
HAVE_WAVEOUT=0
if test "x$waveout" = xyes ; then
AC_MSG_ERROR([*** WaveOut audio support not found])
fi
],
[#include <windows.h>])
else
HAVE_WAVEOUT=0
fi
AC_SUBST(HAVE_WAVEOUT)
AM_CONDITIONAL([HAVE_WAVEOUT], [test "x$HAVE_WAVEOUT" = x1])
#### GLib 2 support (optional) #### #### GLib 2 support (optional) ####
AC_ARG_ENABLE([glib2], AC_ARG_ENABLE([glib2],
@ -1529,6 +1562,11 @@ if test "x$HAVE_SOLARIS" = "x1" ; then
ENABLE_SOLARIS=yes ENABLE_SOLARIS=yes
fi fi
ENABLE_WAVEOUT=no
if test "x$HAVE_WAVEOUT" = "x1" ; then
ENABLE_WAVEOUT=yes
fi
ENABLE_GTK20=no ENABLE_GTK20=no
if test "x$HAVE_GTK20" = "x1" ; then if test "x$HAVE_GTK20" = "x1" ; then
ENABLE_GTK20=yes ENABLE_GTK20=yes
@ -1650,6 +1688,7 @@ echo "
System Config Path: ${PA_SYSTEM_CONFIG_PATH} System Config Path: ${PA_SYSTEM_CONFIG_PATH}
Compiler: ${CC} Compiler: ${CC}
CFLAGS: ${CFLAGS} CFLAGS: ${CFLAGS}
LIBS: ${LIBS}
Have X11: ${ENABLE_X11} Have X11: ${ENABLE_X11}
Enable OSS Output: ${ENABLE_OSS_OUTPUT} Enable OSS Output: ${ENABLE_OSS_OUTPUT}
@ -1657,6 +1696,7 @@ echo "
Enable CoreAudio: ${ENABLE_COREAUDIO} Enable CoreAudio: ${ENABLE_COREAUDIO}
Enable Alsa: ${ENABLE_ALSA} Enable Alsa: ${ENABLE_ALSA}
Enable Solaris: ${ENABLE_SOLARIS} Enable Solaris: ${ENABLE_SOLARIS}
Enable WaveOut: ${ENABLE_WAVEOUT}
Enable GLib 2.0: ${ENABLE_GLIB20} Enable GLib 2.0: ${ENABLE_GLIB20}
Enable Gtk+ 2.0: ${ENABLE_GTK20} Enable Gtk+ 2.0: ${ENABLE_GTK20}
Enable GConf: ${ENABLE_GCONF} Enable GConf: ${ENABLE_GCONF}
@ -1687,7 +1727,7 @@ echo "
Preopened modules: ${PREOPEN_MODS} Preopened modules: ${PREOPEN_MODS}
" "
if test "${ENABLE_DBUS}" = "no" ; then if test "${ENABLE_DBUS}" = "no" && test "x$os_is_win32" != "x1" ; then
echo " echo "
===== WARNING WARNING WARNING WARNING WARNING WARNING WARNING ===== ===== WARNING WARNING WARNING WARNING WARNING WARNING WARNING =====
You do not have DBUS support enabled. It is strongly recommended You do not have DBUS support enabled. It is strongly recommended
@ -1700,7 +1740,7 @@ controling the PulseAudio daemon itself.
" "
fi fi
if test "${ENABLE_UDEV}" = "no" ; then if test "${ENABLE_UDEV}" = "no" && test "x$os_is_win32" != "x1" ; then
echo " echo "
===== WARNING WARNING WARNING WARNING WARNING WARNING WARNING ===== ===== WARNING WARNING WARNING WARNING WARNING WARNING WARNING =====
You do not have udev support enabled. It is strongly recommended You do not have udev support enabled. It is strongly recommended

View file

@ -112,8 +112,10 @@ pulseconf_DATA = \
daemon.conf \ daemon.conf \
client.conf client.conf
if HAVE_DBUS
dbuspolicy_DATA = \ dbuspolicy_DATA = \
daemon/pulseaudio-system.conf daemon/pulseaudio-system.conf
endif
if HAVE_X11 if HAVE_X11
xdgautostart_in_files = \ xdgautostart_in_files = \
@ -175,6 +177,8 @@ endif
# Utility programs # # Utility programs #
################################### ###################################
bin_SCRIPTS = esdcompat
bin_PROGRAMS += \ bin_PROGRAMS += \
pacat \ pacat \
pactl pactl
@ -189,14 +193,13 @@ endif
if HAVE_X11 if HAVE_X11
bin_PROGRAMS += pax11publish bin_PROGRAMS += pax11publish
bin_SCRIPTS += start-pulseaudio-x11 start-pulseaudio-kde
endif endif
if HAVE_AVAHI if HAVE_AVAHI
bin_PROGRAMS += pabrowse bin_PROGRAMS += pabrowse
endif endif
bin_SCRIPTS = esdcompat start-pulseaudio-x11 start-pulseaudio-kde
pacat_SOURCES = utils/pacat.c pacat_SOURCES = utils/pacat.c
pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS) pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS)
pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
@ -1183,7 +1186,7 @@ pulselibexec_PROGRAMS += \
gconf-helper gconf-helper
endif endif
if OS_IS_WIN32 if HAVE_WAVEOUT
modlibexec_LTLIBRARIES += \ modlibexec_LTLIBRARIES += \
module-waveout.la module-waveout.la
endif endif