From ebc2929f0001ebe6563b4af6ab64ef217498c121 Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <waker@users.sourceforge.net>
Date: Sat, 7 Jun 2014 11:56:38 +0200
Subject: vorbis and flac static build fix

---
 configure.ac             | 8 ++++----
 plugins/flac/Makefile.am | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index b0d74f82..76338d66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,7 +353,7 @@ dnl vorbis plugin
 AS_IF([test "${enable_vorbis}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
         HAVE_VORBISPLUGIN=yes
-        VORBIS_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisfile.a"
+        VORBIS_LIBS="-lvorbisfile -lvorbis -lm -logg"
         VORBIS_CFLAGS="-I../../$LIB/include"
         AC_SUBST(VORBIS_LIBS)
         AC_SUBST(VORBIS_CFLAGS)
@@ -362,7 +362,7 @@ AS_IF([test "${enable_vorbis}" != "no"], [
         AC_CHECK_LIB([vorbisfile], [main], [HAVE_VORBISFILE=yes])
         AS_IF([test "$HAVE_VORBIS" = "yes" -a "${HAVE_VORBISFILE}" = "yes"], [
             HAVE_VORBISPLUGIN=yes
-            VORBIS_LIBS="-logg -lvorbis -lvorbisfile"
+            VORBIS_LIBS="-lvorbis -lvorbisfile"
             AC_SUBST(VORBIS_LIBS)
         ])
     ])
@@ -371,7 +371,7 @@ AS_IF([test "${enable_vorbis}" != "no"], [
 dnl libogg for oggedit
 AS_IF([test "${enable_staticlink}" != "no"], [
     HAVE_OGG=yes
-    OGG_LIBS="../../$LIB/lib/libogg.a"
+    OGG_LIBS="-logg"
     OGG_CFLAGS="-I../../$LIB/include"
     AC_SUBST(OGG_LIBS)
     AC_SUBST(OGG_CFLAGS)
@@ -390,7 +390,7 @@ AS_IF([test "${enable_flac}" != "no"], [
     AS_IF([test "${enable_staticlink}" != "no"], [
         HAVE_FLACPLUGIN=yes
         FLAC_CFLAGS="-I../../$LIB/include"
-        FLAC_LIBS="../../$LIB/lib/libFLAC.a"
+        FLAC_LIBS="-lFLAC"
         AC_SUBST(FLAC_CFLAGS)
         AC_SUBST(FLAC_LIBS)
     ], [
diff --git a/plugins/flac/Makefile.am b/plugins/flac/Makefile.am
index 5b1f5c7e..c8e82765 100644
--- a/plugins/flac/Makefile.am
+++ b/plugins/flac/Makefile.am
@@ -5,7 +5,7 @@ flac_la_SOURCES = flac.c
 flac_la_LDFLAGS = -module -avoid-version -export-symbols-regex flac_load
 
 if HAVE_OGG
-oggedit_def = -DUSE_OGGEDIT=1 $(OGG_CFLAGS)
+oggedit_def = -DUSE_OGGEDIT=1
 oggedit_lib = ../liboggedit/liboggedit.a $(OGG_LIBS)
 endif
 
-- 
cgit v1.2.3