oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: add OpenSSL check for RAOP output plugin

Browse Source 
Auto-enable the plugin when OpenSSL was found.
This commit is contained in:
Max Kellermann 2011-08-29 09:21:00 +02:00
parent 6e3b643bdf
commit 453368078b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -689,6 +689,7 @@ OUTPUT_CFLAGS = \
$(FFADO_CFLAGS) \ $(FFADO_CFLAGS) \
$(JACK_CFLAGS) \ $(JACK_CFLAGS) \
$(OPENAL_CFLAGS) \ $(OPENAL_CFLAGS) \
$(OPENSSL_CFLAGS) \
$(PULSE_CFLAGS) \ $(PULSE_CFLAGS) \
$(SHOUT_CFLAGS) $(SHOUT_CFLAGS)
@ -777,6 +778,7 @@ OUTPUT_SRC += \
src/ntp_server.c src/ntp_server.h \ src/ntp_server.c src/ntp_server.h \
src/output/raop_output_plugin.c src/output/raop_output_plugin.c
MIXER_SRC += src/mixer/raop_mixer_plugin.c MIXER_SRC += src/mixer/raop_mixer_plugin.c
OUTPUT_LIBS += $(OPENSSL_LIBS)
endif endif
if HAVE_PULSE if HAVE_PULSE

8
configure.ac
View File

@ -213,7 +213,7 @@ AC_ARG_ENABLE(httpd-output,
AC_ARG_ENABLE(raop-output, AC_ARG_ENABLE(raop-output,
AS_HELP_STRING([--enable-raop-output], AS_HELP_STRING([--enable-raop-output],
[enables the RAOP output]),, [enables the RAOP output]),,
[enable_raop_output=no]) [enable_raop_output=auto])
AC_ARG_ENABLE(id3, AC_ARG_ENABLE(id3,
AS_HELP_STRING([--disable-id3], AS_HELP_STRING([--disable-id3],
@ -1441,9 +1441,11 @@ AM_CONDITIONAL(ENABLE_SOLARIS_OUTPUT, test x$enable_solaris_output = xyes)
dnl --------------------------------- RAOP ------------------------------------ dnl --------------------------------- RAOP ------------------------------------
MPD_AUTO_PKG(raop_output, OPENSSL, [openssl],
[RAOP output], [OpenSSL not found])
if test x$enable_raop_output = xyes; then if test x$enable_raop_output = xyes; then
AC_DEFINE(ENABLE_RAOP_OUTPUT, 1, [Define for compiling RAOP support]) AC_DEFINE(ENABLE_RAOP_OUTPUT, 1, [Define for compiling RAOP support])
MPD_LIBS="$MPD_LIBS -lssl -lcrypto"
fi fi
AM_CONDITIONAL(ENABLE_RAOP_OUTPUT, test x$enable_raop_output = xyes) AM_CONDITIONAL(ENABLE_RAOP_OUTPUT, test x$enable_raop_output = xyes)