From fb5610f9bd354a84898a8d89dfd140f3c7a9522d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 3 May 2016 12:52:30 +0200
Subject: [PATCH] configure.ac: improve HAVE_XIPH declaration, add HAVE_OGG

---
 configure.ac | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index ab98b19f8..faae616a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1011,11 +1011,6 @@ dnl --------------------------------- WildMidi --------------------------------
 MPD_ENABLE_AUTO_LIB(wildmidi, WILDMIDI, WildMidi, WildMidi_Init, [-lWildMidi], [],
 	[WildMidi decoder plugin], [libwildmidi not found])
 
-dnl ------------------------ Post Decoder Plugins Tests -----------------------
-
-AM_CONDITIONAL(HAVE_XIPH,
-	test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_flac = xyes || test x$enable_opus = xyes)
-
 dnl ---------------------------------------------------------------------------
 dnl Encoders for Streaming Audio Output Plugins
 dnl ---------------------------------------------------------------------------
@@ -1257,6 +1252,23 @@ fi
 
 AM_CONDITIONAL(ENABLE_WINMM_OUTPUT, test x$enable_winmm_output = xyes)
 
+dnl ---------------------------------------------------------------------------
+dnl Option groups
+dnl ---------------------------------------------------------------------------
+
+have_ogg=no
+if test x$enable_vorbis = xyes || test x$enable_tremor = xyes || test x$enable_opus = xyes; then
+	have_ogg=yes
+fi
+
+have_xiph=no
+if test x$enable_ogg = xyes || test x$enable_flac = xyes; then
+	have_xiph=yes
+fi
+
+AM_CONDITIONAL(HAVE_OGG, test x$have_ogg = xyes)
+AM_CONDITIONAL(HAVE_XIPH, test x$have_xiph = xyes)
+
 dnl ---------------------------------------------------------------------------
 dnl Documentation
 dnl ---------------------------------------------------------------------------