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

Makefile.am: use SAMPLERATE_CFLAGS and SAMPLERATE_LIBS

Browse Source 
Don't add those to MPD_CFLAGS and MPD_LIBS.
This commit is contained in:
Max Kellermann 2009-03-28 21:38:44 +01:00
parent de7c16d1be
commit 50c53e4b24
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -12,6 +12,7 @@ src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
$(INPUT_CFLAGS) \ $(INPUT_CFLAGS) \
$(DECODER_CFLAGS) \ $(DECODER_CFLAGS) \
$(ENCODER_CFLAGS) \ $(ENCODER_CFLAGS) \
$(FILTER_CFLAGS) \
$(OUTPUT_CFLAGS) $(OUTPUT_CFLAGS)
src_mpd_LDADD = $(MPD_LIBS) \ src_mpd_LDADD = $(MPD_LIBS) \
$(SQLITE_LIBS) \ $(SQLITE_LIBS) \
@ -20,6 +21,7 @@ src_mpd_LDADD = $(MPD_LIBS) \
$(DECODER_LIBS) \ $(DECODER_LIBS) \
$(ENCODER_LIBS) \ $(ENCODER_LIBS) \
$(OUTPUT_LIBS) \ $(OUTPUT_LIBS) \
$(FILTER_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)
mpd_headers = \ mpd_headers = \
@ -243,6 +245,11 @@ if ENABLE_SQLITE
src_mpd_SOURCES += src/sticker.c src/song_sticker.c src_mpd_SOURCES += src/sticker.c src/song_sticker.c
endif endif
FILTER_CFLAGS = \
$(SAMPLERATE_CFLAGS)
FILTER_LIBS = \
$(SAMPLERATE_LIBS)
if HAVE_LIBSAMPLERATE if HAVE_LIBSAMPLERATE
src_mpd_SOURCES += src/pcm_resample_libsamplerate.c src_mpd_SOURCES += src/pcm_resample_libsamplerate.c
endif endif

6
configure.ac
View File

@ -481,10 +481,8 @@ AC_ARG_ENABLE(lsr,
if test x$enable_lsr = xyes; then if test x$enable_lsr = xyes; then
PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.0.15], PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.0.15],
[enable_lsr=yes;AC_DEFINE([HAVE_LIBSAMPLERATE], 1, [AC_DEFINE([HAVE_LIBSAMPLERATE], 1,
[Define to enable libsamplerate])] [Define to enable libsamplerate])],
MPD_LIBS="$MPD_LIBS $SAMPLERATE_LIBS"
MPD_CFLAGS="$MPD_CFLAGS $SAMPLERATE_CFLAGS",
[enable_lsr=no;AC_MSG_WARN([libsamplerate not found -- disabling])]) [enable_lsr=no;AC_MSG_WARN([libsamplerate not found -- disabling])])
fi fi