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

configure.ac: expose variables OPENAL_CFLAGS and OPENAL_LIBS

Browse Source 
Don't add these to the global MPD_CFLAGS and MPD_LIBS.  This allows
test programs to link without libopenal.
This commit is contained in:
Max Kellermann 2010-01-01 17:10:10 +01:00
parent 9d3865cb95
commit 3adfbfe36d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -599,6 +599,7 @@ OUTPUT_CFLAGS = \
$(AO_CFLAGS) \ $(AO_CFLAGS) \
$(ALSA_CFLAGS) \ $(ALSA_CFLAGS) \
$(JACK_CFLAGS) \ $(JACK_CFLAGS) \
$(OPENAL_CFLAGS) \
$(PULSE_CFLAGS) \ $(PULSE_CFLAGS) \
$(SHOUT_CFLAGS) $(SHOUT_CFLAGS)
@ -606,6 +607,7 @@ OUTPUT_LIBS = \
$(AO_LIBS) \ $(AO_LIBS) \
$(ALSA_LIBS) \ $(ALSA_LIBS) \
$(JACK_LIBS) \ $(JACK_LIBS) \
$(OPENAL_LIBS) \
$(PULSE_LIBS) \ $(PULSE_LIBS) \
$(SHOUT_LIBS) $(SHOUT_LIBS)

8
configure.ac
View File

@ -829,6 +829,9 @@ fi
AM_CONDITIONAL(HAVE_OSS, test x$enable_oss = xyes) AM_CONDITIONAL(HAVE_OSS, test x$enable_oss = xyes)
AC_SUBST(OPENAL_CFLAGS,"")
AC_SUBST(OPENAL_LIBS,"")
if test x$enable_openal = xyes; then if test x$enable_openal = xyes; then
if test x$enable_osx = xyes; then if test x$enable_osx = xyes; then
AC_CHECK_HEADERS([OpenAL/al.h OpenAL/alc.h], [], [enable_openal=no]) AC_CHECK_HEADERS([OpenAL/al.h OpenAL/alc.h], [], [enable_openal=no])
@ -845,11 +848,6 @@ if test x$enable_openal = xyes; then
fi fi
fi fi
if test x$enable_openal = xyes; then
MPD_CFLAGS="$MPD_CFLAGS $OPENAL_CFLAGS"
MPD_LIBS="$MPD_LIBS $OPENAL_LIBS"
fi
AM_CONDITIONAL(HAVE_OPENAL, test x$enable_openal = xyes) AM_CONDITIONAL(HAVE_OPENAL, test x$enable_openal = xyes)
if test x$enable_fifo = xyes; then if test x$enable_fifo = xyes; then