Makefile.am: use JACK_CFLAGS and JACK_LIBS
Don't add those to MPD_CFLAGS and MPD_LIBS.
This commit is contained in:
parent
50c53e4b24
commit
5164cc1ff8
@ -448,11 +448,13 @@ endif
|
|||||||
OUTPUT_CFLAGS = \
|
OUTPUT_CFLAGS = \
|
||||||
$(AO_CFLAGS) \
|
$(AO_CFLAGS) \
|
||||||
$(ALSA_CFLAGS) \
|
$(ALSA_CFLAGS) \
|
||||||
|
$(JACK_CFLAGS) \
|
||||||
$(SHOUT_CFLAGS)
|
$(SHOUT_CFLAGS)
|
||||||
|
|
||||||
OUTPUT_LIBS = \
|
OUTPUT_LIBS = \
|
||||||
$(AO_LIBS) \
|
$(AO_LIBS) \
|
||||||
$(ALSA_LIBS) \
|
$(ALSA_LIBS) \
|
||||||
|
$(JACK_LIBS) \
|
||||||
$(SHOUT_LIBS)
|
$(SHOUT_LIBS)
|
||||||
|
|
||||||
OUTPUT_API_SRC = \
|
OUTPUT_API_SRC = \
|
||||||
|
@ -700,11 +700,8 @@ AM_CONDITIONAL(HAVE_ALSA, test x$enable_alsa = xyes)
|
|||||||
if test x$enable_jack = xyes; then
|
if test x$enable_jack = xyes; then
|
||||||
PKG_CHECK_MODULES([JACK],
|
PKG_CHECK_MODULES([JACK],
|
||||||
[jack >= 0.4],
|
[jack >= 0.4],
|
||||||
[enable_jack=yes;
|
[AC_DEFINE([HAVE_JACK], 1,
|
||||||
AC_DEFINE([HAVE_JACK], 1,
|
[Define to enable JACK support])],
|
||||||
[Define to enable JACK support])]
|
|
||||||
MPD_LIBS="$MPD_LIBS $JACK_LIBS"
|
|
||||||
MPD_CFLAGS="$MPD_CFLAGS $JACK_CFLAGS",
|
|
||||||
enable_jack=no)
|
enable_jack=no)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user