From 294cce2710560984c69bb79ee1f08900666fc09e Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Fri, 16 Apr 2010 20:08:27 -0700 Subject: configure.ac: Move OpenAL to Audio Output Plugins (nonstreaming), add header. --- configure.ac | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 9ae73779b..4355149e3 100644 --- a/configure.ac +++ b/configure.ac @@ -906,7 +906,27 @@ fi AM_CONDITIONAL(HAVE_AO, test x$enable_ao = xyes) +dnl ---------------------------------- OpenAL --------------------------------- +AC_SUBST(OPENAL_CFLAGS,"") +AC_SUBST(OPENAL_LIBS,"") +if test x$enable_openal = xyes; then + if test x$enable_osx = xyes; then + AC_CHECK_HEADERS([OpenAL/al.h OpenAL/alc.h], [], [enable_openal=no]) + if test x$enable_openal = xyes; then + OPENAL_LIBS="-framework OpenAL" + AC_DEFINE(HAVE_OPENAL, 1, [Define for OpenAL support]) + else + AC_MSG_WARN(OpenAL headers not found -- disabling OpenAL support) + fi + else + PKG_CHECK_MODULES([OPENAL], [openal], + AC_DEFINE(HAVE_OPENAL, 1, [Define for OpenAL support]), + enable_openal=no) + fi +fi + +AM_CONDITIONAL(HAVE_OPENAL, test x$enable_openal = xyes) if test x$enable_pipe_output = xyes; then AC_DEFINE([ENABLE_PIPE_OUTPUT], 1, @@ -964,26 +984,7 @@ fi 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_osx = xyes; then - AC_CHECK_HEADERS([OpenAL/al.h OpenAL/alc.h], [], [enable_openal=no]) - if test x$enable_openal = xyes; then - OPENAL_LIBS="-framework OpenAL" - AC_DEFINE(HAVE_OPENAL, 1, [Define for OpenAL support]) - else - AC_MSG_WARN(OpenAL headers not found -- disabling OpenAL support) - fi - else - PKG_CHECK_MODULES([OPENAL], [openal], - AC_DEFINE(HAVE_OPENAL, 1, [Define for OpenAL support]), - enable_openal=no) - fi -fi - -AM_CONDITIONAL(HAVE_OPENAL, test x$enable_openal = xyes) -- cgit v1.2.3