Modularise the RAOP stuff that requires OpenSSL and make it optional at compile time

5 files changed, 27 insertions, 8 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 4ffdfd93..f216b71b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,6 +62,10 @@ AM_CFLAGS += -DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\"
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS += '-DDEBUG_TRAP=__asm__("int $$3")'
 
+if HAVE_OPENSSL
+AM_CFLAGS += -I$(top_builddir)/src/modules/raop
+endif
+
 AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
 AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS)
 
@@ -89,6 +93,7 @@ PA_THREAD_OBJS = \
 		pulsecore/semaphore-posix.c pulsecore/semaphore.h
 endif
 
+
 ###################################
 #          Extra files            #
 ###################################
@@ -1009,11 +1014,16 @@ librtp_la_SOURCES = \
 		modules/rtp/sdp.c modules/rtp/sdp.h \
 		modules/rtp/sap.c modules/rtp/sap.h \
 		modules/rtp/rtsp_client.c modules/rtp/rtsp_client.h \
-		modules/rtp/raop_client.c modules/rtp/raop_client.h \
-		modules/rtp/headerlist.c modules/rtp/headerlist.h \
-		modules/rtp/base64.c modules/rtp/base64.h
+		modules/rtp/headerlist.c modules/rtp/headerlist.h
 librtp_la_LDFLAGS = -avoid-version
-librtp_la_LIBADD = $(AM_LIBADD) libsocket-util.la libiochannel.la libsocket-client.la libioline.la libpulsecore.la -lssl
+librtp_la_LIBADD = $(AM_LIBADD) libsocket-util.la libiochannel.la libsocket-client.la libioline.la libpulsecore.la
+
+libraop_la_SOURCES = \
+        modules/raop/raop_client.c modules/raop/raop_client.h \
+        modules/raop/base64.c modules/raop/base64.h
+libraop_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS)
+libraop_la_LDFLAGS = -avoid-version
+libraop_la_LIBADD = $(AM_LIBADD) $(OPENSSL_LIBS) libsocket-util.la libiochannel.la libsocket-client.la libioline.la libpulsecore.la librtp.la
 
 # X11
 
@@ -1060,7 +1070,6 @@ modlibexec_LTLIBRARIES += \
 		module-remap-sink.la \
 		module-ladspa-sink.la \
 		module-esound-sink.la \
-		module-raop-sink.la \
 		module-tunnel-sink.la \
 		module-tunnel-source.la \
 		module-position-event-sounds.la
@@ -1127,8 +1136,7 @@ endif
 if HAVE_AVAHI
 modlibexec_LTLIBRARIES += \
 		module-zeroconf-publish.la \
-		module-zeroconf-discover.la \
-		module-raop-discover.la
+		module-zeroconf-discover.la
 endif
 
 if HAVE_LIRC
@@ -1186,6 +1194,17 @@ pulselibexec_PROGRAMS += \
 		proximity-helper
 endif
 
+if HAVE_OPENSSL
+modlibexec_LTLIBRARIES += \
+		libraop.la \
+		module-raop-sink.la
+if HAVE_AVAHI
+modlibexec_LTLIBRARIES += \
+		module-raop-discover.la
+endif
+endif
+
+
 # These are generated by a M4 script
 
 SYMDEF_FILES = \
@@ -1609,7 +1628,7 @@ module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 # Apple Airtunes/RAOP
 module_raop_sink_la_SOURCES = modules/module-raop-sink.c
 module_raop_sink_la_LDFLAGS = -module -avoid-version
-module_raop_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la librtp.la
+module_raop_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la librtp.la libraop.la
 
 module_raop_discover_la_SOURCES = modules/module-raop-discover.c
 module_raop_discover_la_LDFLAGS = -module -avoid-version
diff --git a/src/modules/rtp/base64.c b/src/modules/raop/base64.c
index 8918def8..8918def8 100644
--- a/src/modules/rtp/base64.c
+++ b/src/modules/raop/base64.c
diff --git a/src/modules/rtp/base64.h b/src/modules/raop/base64.h
index dac0e707..dac0e707 100644
--- a/src/modules/rtp/base64.h
+++ b/src/modules/raop/base64.h
diff --git a/src/modules/rtp/raop_client.c b/src/modules/raop/raop_client.c
index 4627545e..4627545e 100644
--- a/src/modules/rtp/raop_client.c
+++ b/src/modules/raop/raop_client.c
diff --git a/src/modules/rtp/raop_client.h b/src/modules/raop/raop_client.h
index ec3136a7..ec3136a7 100644
--- a/src/modules/rtp/raop_client.h
+++ b/src/modules/raop/raop_client.h