Merge branch 'refs/heads/t/com_ls_compat'

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index edfc8d1d08e79f333afce711aa814a374c8f1faf..eb0813df1cb10d16512fd6a863d7c50cb24cba43 100644 (file)
--- a/afh_common.c
+++ b/afh_common.c
@@ -42,7 +42,7 @@ static struct audio_format_handler afl[] = {
        },
        {
                .name = "ogg",
-#ifdef HAVE_OGGVORBIS
+#if defined(HAVE_OGG) && defined(HAVE_VORBIS)
                .init = ogg_init,
 #endif
        },
@@ -58,19 +58,19 @@ static struct audio_format_handler afl[] = {
        },
        {
                .name = "spx",
-#ifdef HAVE_SPEEX
+#if defined(HAVE_OGG) && defined(HAVE_SPEEX)
                .init = spx_afh_init,
 #endif
        },
        {
                .name = "flac",
-#ifdef HAVE_FLAC
+#if defined(HAVE_OGG) && defined(HAVE_FLAC)
                .init = flac_afh_init,
 #endif
        },
        {
                .name = "opus",
-#ifdef HAVE_OPUS
+#if defined(HAVE_OGG) && defined(HAVE_OPUS)
                .init = opus_afh_init,
 #endif
        },