From ade8aadd3c291b7b33e8004ca168b70dfbe325cb Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 2 Oct 2017 20:55:51 +0100
Subject: CONFIGURE: Add ogg after libraries that might depend on it in the
 link command

This will hopefully fix compilation with mingw when using static libraries.
---
 configure | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 98cc9879bc..6938bec2a6 100755
--- a/configure
+++ b/configure
@@ -3921,10 +3921,6 @@ int main(void) { return 0; }
 EOF
 	cc_check $OGG_CFLAGS $OGG_LIBS -logg && _ogg=yes
 fi
-if test "$_ogg" = yes ; then
-	append_var LIBS "$OGG_LIBS -logg"
-	append_var INCLUDES "$OGG_CFLAGS"
-fi
 define_in_config_if_yes "$_ogg" 'USE_OGG'
 echo "$_ogg"
 
@@ -4026,6 +4022,12 @@ fi
 define_in_config_if_yes "$_flac" 'USE_FLAC'
 echo "$_flac"
 
+# Add the link to ogg only after verbs tremor and flac as it might be used by those.
+if test "$_ogg" = yes ; then
+	append_var LIBS "$OGG_LIBS -logg"
+	append_var INCLUDES "$OGG_CFLAGS"
+fi
+
 #
 # Check for MAD (MP3 library)
 #
-- 
cgit v1.2.3