oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Makefile.am: use TREMOR_CFLAGS and TREMOR_LIBS

Browse Source 
Don't append those two CFLAGS/LIBS in configure.ac.
This commit is contained in:
Max Kellermann
2009-04-01 22:45:00 +02:00
parent 780ce49249
commit b914d3f6eb
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

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

10
configure.ac
View File

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