[aqualung-friends] [PATCH 07/10] podcast: use conditional compilation

[Jamie H. <ja...@au...>]

Use automake's conditionals to only compile podcast support when its
inclusion in the build hasn't been disabled.  Also, stop displaying a
message claiming that we're checking for podcast support during
configure, there's nothing to check, and the summary is indiciation
enough of the builder's intent.
---
 configure.ac        |    3 +--
 src/Makefile.am     |    6 ++++--
 src/gui_main.c      |    2 ++
 src/music_browser.c |    3 +++
 src/podcast.c       |    4 +---
 src/podcast.h       |    4 +---
 src/store_podcast.c |    3 ---
 src/store_podcast.h |    4 +---
 8 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6f4b2ba..65b6294 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,13 +151,12 @@ AC_MSG_RESULT([$enable_loop])
 AS_IF([test "x$enable_loop" = 'xyes'],
     [AC_DEFINE([HAVE_LOOP], [1], [Define to build with loop playback support])])
 
-AC_MSG_CHECKING([for podcast support])
 AC_ARG_ENABLE([podcast],
     [AS_HELP_STRING([--disable-podcast], [compile without podcast support])],
     [], [enable_podcast='yes'])
-AC_MSG_RESULT([$enable_podcast])
 AS_IF([test "x$enable_podcast" = 'xyes'],
     [AC_DEFINE([HAVE_PODCAST], [1], [Define to build with podcast support])])
+AM_CONDITIONAL([HAVE_PODCAST], [test "x$enable_podcast" = 'xyes'])
 
 AC_MSG_CHECKING([for systray support])
 AC_ARG_ENABLE([systray],
diff --git a/src/Makefile.am b/src/Makefile.am
index 32c1bf2..38709ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@ metadata_ogg.h metadata_ogg.c \
 music_browser.h music_browser.c \
 options.h options.c \
 playlist.h playlist.c \
-podcast.h podcast.c \
 ports.h ports.c \
 rb.h rb.c \
 search.h search.c \
@@ -60,7 +59,6 @@ search_playlist.h search_playlist.c \
 segv.h segv.c \
 skin.h skin.c \
 store_file.h store_file.c \
-store_podcast.h store_podcast.c \
 transceiver.c transceiver.h \
 trashlist.c trashlist.h \
 utils.c utils.h \
@@ -85,3 +83,7 @@ endif
 if HAVE_LADSPA
 aqualung_SOURCES += plugin.h plugin.c
 endif
+
+if HAVE_PODCAST
+aqualung_SOURCES += podcast.h podcast.c store_podcast.h store_podcast.c
+endif
diff --git a/src/gui_main.c b/src/gui_main.c
index ad36045..a80c21a 100644
--- a/src/gui_main.c
+++ b/src/gui_main.c
@@ -63,7 +63,9 @@
 #include "ports.h"
 #include "music_browser.h"
 #include "store_file.h"
+#ifdef HAVE_PODCAST
 #include "store_podcast.h"
+#endif /* HAVE_PODCAST */
 #include "playlist.h"
 #include "file_info.h"
 #include "i18n.h"
diff --git a/src/music_browser.c b/src/music_browser.c
index 81dea6e..bf872be 100644
--- a/src/music_browser.c
+++ b/src/music_browser.c
@@ -46,7 +46,10 @@
 #include "store_cdda.h"
 #endif /* HAVE_CDDA */
 #include "store_file.h"
+#ifdef HAVE_PODCAST
 #include "store_podcast.h"
+#endif /* HAVE_PODCAST */
+
 
 extern options_t options;
 
diff --git a/src/podcast.c b/src/podcast.c
index 100d226..9e7bdf8 100644
--- a/src/podcast.c
+++ b/src/podcast.c
@@ -20,8 +20,6 @@
 
 #include <config.h>
 
-#ifdef HAVE_PODCAST
-
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,6 +45,7 @@
 #include "store_podcast.h"
 #include "podcast.h"
 
+
 #define BUFSIZE 10240
 
 extern options_t options;
@@ -883,4 +882,3 @@ podcast_update(podcast_t * podcast) {
 	}
 }
 
-#endif /* HAVE_PODCAST */
diff --git a/src/podcast.h b/src/podcast.h
index d547e42..ce488e0 100644
--- a/src/podcast.h
+++ b/src/podcast.h
@@ -23,10 +23,9 @@
 
 #include <config.h>
 
-#ifdef HAVE_PODCAST
-
 #include <glib.h>
 
+
 typedef struct {
 
 	char * file;
@@ -86,6 +85,5 @@ void podcast_item_free(podcast_item_t * item);
 
 void podcast_update(podcast_t * podcast);
 
-#endif /* HAVE_PODCAST */
 
 #endif /* _PODCAST_H */
diff --git a/src/store_podcast.c b/src/store_podcast.c
index a217032..18e8816 100644
--- a/src/store_podcast.c
+++ b/src/store_podcast.c
@@ -21,8 +21,6 @@
 
 #include <config.h>
 
-#ifdef HAVE_PODCAST
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -2149,6 +2147,5 @@ store_podcast_load(void) {
 	xmlFreeDoc(doc);
 }
 
-#endif /* HAVE_PODCAST */
 
 // vim: shiftwidth=8:tabstop=8:softtabstop=8 :  
diff --git a/src/store_podcast.h b/src/store_podcast.h
index e1031ee..dfe763a 100644
--- a/src/store_podcast.h
+++ b/src/store_podcast.h
@@ -24,12 +24,11 @@
 
 #include <config.h>
 
-#ifdef HAVE_PODCAST
-
 #include <gtk/gtk.h>
 
 #include "podcast.h"
 
+
 int store_podcast_iter_is_track(GtkTreeIter * iter);
 void store_podcast_iter_addlist_defmode(GtkTreeIter * ms_iter, GtkTreeIter * pl_iter, int new_tab);
 void store_podcast_selection_changed(GtkTreeIter * iter, GtkTextBuffer * buffer, GtkLabel * statusbar);
@@ -64,7 +63,6 @@ void store_podcast_remove_item(podcast_t * podcast, podcast_item_t * item);
 void store_podcast_save(void);
 void store_podcast_load(void);
 
-#endif /* HAVE_PODCAST */
 
 #endif /* _STORE_PODCAST_H */
 
-- 
1.7.8.2