Makefile.am: use TREMOR_CFLAGS and TREMOR_LIBS

Makefile.am

@@ -291,7 +291,7 @@ endif
 # decoder plugins
 
 DECODER_CFLAGS = \
-	$(OGGVORBIS_CFLAGS) \
+	$(OGGVORBIS_CFLAGS) $(TREMOR_CFLAGS) \
 	$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
 	$(AUDIOFILE_CFLAGS) \
 	$(LIBMIKMOD_CFLAGS) \
@@ -304,7 +304,8 @@ DECODER_CFLAGS = \
 	$(CUE_CFLAGS)
 
 DECODER_LIBS = \
-	$(OGGVORBIS_LIBS) $(FLAC_LIBS) \
+	$(OGGVORBIS_LIBS) $(TREMOR_LIBS) \
+	$(FLAC_LIBS) \
 	$(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \
 	$(MODPLUG_LIBS) \
 	$(SIDPLAY_LIBS) \

configure.ac

@@ -782,11 +782,10 @@ if test x$use_tremor = xyes; then
 	LIBS="$LIBS $TREMOR_LIBS"
 	AC_CHECK_LIB(vorbisidec,ov_read,enable_oggvorbis=yes,enable_oggvorbis=no;
 		AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support]))
+	CFLAGS="$ac_save_CFLAGS"
+	LIBS="$ac_save_LIBS"
 	if test x$enable_oggvorbis = xyes; then
-		AC_DEFINE(HAVE_OGGVORBIS, 1, [Define for Ogg Vorbis support]),
-	else
-		CFLAGS="$ac_save_CFLAGS"
-		LIBS="$ac_save_LIBS"
+		AC_DEFINE(HAVE_OGGVORBIS, 1, [Define for Ogg Vorbis support])
 	fi
 elif test x$enable_oggvorbis = xyes; then
 	PKG_CHECK_MODULES(OGGVORBIS, [ogg vorbis vorbisfile],
@@ -805,6 +804,9 @@ if test x$use_tremor = xyes; then
 	fi
 fi
 
+AC_SUBST(TREMOR_CFLAGS)
+AC_SUBST(TREMOR_LIBS)
+
 if test x$enable_flac = xyes; then
 	PKG_CHECK_MODULES(FLAC, [flac >= 1.1],
 		AC_DEFINE(HAVE_FLAC, 1, [Define for FLAC support]),