fix builds that only have FLAC >= 1.1.3 but not Ogg-Vorbis

src/inputPlugins/_flac_common.h

@@ -80,15 +80,13 @@ typedef unsigned flac_read_status_size_t;
 #  ifdef HAVE_OGGFLAC
 #    include <OggFLAC/seekable_stream_decoder.h>
 #  endif
-#else /* FLAC_API_VERSION_CURRENT >= 7 */
+#else /* FLAC_API_VERSION_CURRENT > 7 */
 
-   /* OggFLAC support is handled by our flac_plugin already, and
-    * thus we *can* always have it if libFLAC was compiled with it */
-#  ifndef HAVE_OGGFLAC
-#    define HAVE_OGGFLAC 1
-#  endif
+/*
+ * OggFLAC support is handled by our flac_plugin already, and
+ * thus we *can* always have it if libFLAC was compiled with it
+ */
 #  include "_ogg_common.h"
-#  undef HAVE_OGGFLAC /* we don't need this defined anymore */
 
 #  include <FLAC/stream_decoder.h>
 #  define flac_decoder           FLAC__StreamDecoder

src/inputPlugins/_ogg_common.c

@@ -24,7 +24,8 @@
 #include "_flac_common.h"
 #include "_ogg_common.h"
 
-#if defined(HAVE_OGGFLAC) || defined(HAVE_OGGVORBIS)
+#if defined(HAVE_OGGFLAC) || defined(HAVE_OGGVORBIS) || \
+  (defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7)
 
 #include "../utils.h"
 

src/inputPlugins/_ogg_common.h

@@ -24,7 +24,8 @@
 
 #include "../inputPlugin.h"
 
-#if defined(HAVE_OGGFLAC) || defined(HAVE_OGGVORBIS)
+#if defined(HAVE_OGGFLAC) || defined(HAVE_OGGVORBIS) || \
+  (defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7)
 
 typedef enum _ogg_stream_type { VORBIS, FLAC } ogg_stream_type;