From 42d4e150d86fb5a1b8ae214c63e415c3cc57fb37 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Thu, 25 Aug 2016 23:06:51 +0200 Subject: [PATCH] [pulseaudio] Make both ALSA and Pulseaudio default in configure.ac --- configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 6c35376a..04c87667 100644 --- a/configure.ac +++ b/configure.ac @@ -159,7 +159,7 @@ AC_CHECK_HEADERS(stdint.h,,) dnl --- Begin configuring the options --- dnl iTunes playlists with libplist -AC_ARG_ENABLE(itunes, AS_HELP_STRING([--enable-itunes], [enable iTunes library support (default=no)])) +AC_ARG_ENABLE(itunes, AS_HELP_STRING([--enable-itunes], [enable iTunes Music Library XML support (default=no)])) AS_IF([test "x$enable_itunes" = "xyes"], [ CPPFLAGS="${CPPFLAGS} -DITUNES" PKG_CHECK_MODULES(LIBPLIST, [ libplist >= 0.16 ]) @@ -167,7 +167,7 @@ AS_IF([test "x$enable_itunes" = "xyes"], [ AM_CONDITIONAL(COND_ITUNES, [test "x$enable_itunes" = "xyes"]) dnl Spotify with dynamic linking to libspotify -AC_ARG_ENABLE(spotify, AS_HELP_STRING([--enable-spotify], [enable Spotify library support (default=no)])) +AC_ARG_ENABLE(spotify, AS_HELP_STRING([--enable-spotify], [enable Spotify support (default=no)])) AS_IF([test "x$enable_spotify" = "xyes"], [ CPPFLAGS="${CPPFLAGS} -DSPOTIFY" AC_CHECK_HEADER(libspotify/api.h, , AC_MSG_ERROR([libspotify/api.h not found])) @@ -216,23 +216,23 @@ AS_IF([test "x$enable_mpd" != "xno"], [ AM_CONDITIONAL(COND_MPD, [test "x$enable_mpd" != "xno"]) dnl ALSA -AC_ARG_WITH(alsa, AS_HELP_STRING([--with-alsa], [use ALSA (default yes)])) -AS_IF([test "x$with_alsa" = "xyes"], [ +AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa], [without ALSA support (default=no)])) +AS_IF([test "x$with_alsa" != "xno"], [ CPPFLAGS="${CPPFLAGS} -DALSA" PKG_CHECK_MODULES(ALSA, [ alsa ]) ]) -AM_CONDITIONAL(COND_ALSA, test x$use_alsa = xtrue) +AM_CONDITIONAL(COND_ALSA, [test "x$with_alsa" != "xno"]) dnl PULSEAUDIO -AC_ARG_WITH(pulseaudio, AS_HELP_STRING([--with-pulseaudio], [use Pulseaudio (default no)])) -AS_IF([test "x$with_pulseaudio" = "xyes"], [ +AC_ARG_WITH(pulseaudio, AS_HELP_STRING([--without-pulseaudio], [without Pulseaudio support (default=no)])) +AS_IF([test "x$with_pulseaudio" != "xno"], [ CPPFLAGS="${CPPFLAGS} -DPULSEAUDIO" PKG_CHECK_MODULES(LIBPULSE, [ libpulse ]) AC_SEARCH_LIBS([pa_threaded_mainloop_set_name], [pulse], AC_DEFINE(HAVE_PULSE_MAINLOOP_SET_NAME, 1, [Define to 1 if you have Pulseaudio with pa_threaded_mainloop_set_name]) ) ]) -AM_CONDITIONAL(COND_PULSEAUDIO, [test "x$with_pulseaudio" = "xyes"]) +AM_CONDITIONAL(COND_PULSEAUDIO, [test "x$with_pulseaudio" != "xno"]) dnl --- End options --- dnl Checks for header files.