build: Convert speex detection to new macros.

[paraslash.git] / afh_common.c

diff --git a/afh_common.c b/afh_common.c
index edfc8d1d08e79f333afce711aa814a374c8f1faf..b23ca97bd62b5db2371f11c5b2364f9e396a32c6 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,7 +58,7 @@ static struct audio_format_handler afl[] = {
        },
        {
                .name = "spx",
-#ifdef HAVE_SPEEX
+#if defined(HAVE_OGG) && defined(HAVE_SPEEX)
                .init = spx_afh_init,
 #endif
        },