--- configure.ac | 16 +++++++++++++--- src/output/openal_plugin.c | 6 ++++++ 2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac index d30e892..e221855 100644 --- a/configure.ac +++ b/configure.ac @@ -791,9 +791,19 @@ fi AM_CONDITIONAL(HAVE_OSS, test x$enable_oss = xyes) if test x$enable_openal = xyes; then - PKG_CHECK_MODULES([OPENAL], [openal], - AC_DEFINE(HAVE_OPENAL, 1, [Define for OpenAL support]), - enable_openal=no) + 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 if test x$enable_openal = xyes; then diff --git a/src/output/openal_plugin.c b/src/output/openal_plugin.c index e60e378..92ee82e 100644 --- a/src/output/openal_plugin.c +++ b/src/output/openal_plugin.c @@ -19,11 +19,17 @@ #include "../output_api.h" #include "../timer.h" +#include "config.h" #include <glib.h> +#ifndef HAVE_OSX #include <AL/al.h> #include <AL/alc.h> +#else +#include <OpenAL/al.h> +#include <OpenAL/alc.h> +#endif #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "openal" -- 1.6.3.2
pgpV2WLaT9NOm.pgp
Description: PGP signature
------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________ Musicpd-dev-team mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
