2011-05-08 14:08:44 +00:00

89 lines
2.9 KiB
Plaintext

$OpenBSD: patch-configure_ac,v 1.8 2011/05/08 14:08:44 dcoppa Exp $
--- configure.ac.orig Sun Apr 17 15:29:25 2011
+++ configure.ac Wed May 4 11:22:08 2011
@@ -810,13 +810,21 @@ AC_ARG_ENABLE( jack,
[enable_jack="yes"])
if test "x$enable_jack" = "xyes"; then
- AM_PATH_JACK(have_jack=yes, have_jack=no)
+ PKG_CHECK_MODULES(JACK, jack >= 0.109.10, , [AC_MSG_WARN(
+ [*** Cannot find jack 0.109.10 or newer, jack will not be built ***])
+ enable_jack=no])
else
AC_MSG_RESULT([*** jack plugin disabled per user request ***])
- have_jack=no
+ enable_jack=no
fi
-if test "x$have_jack" = "xyes"; then
+if test "x$enable_jack" = xyes; then
+ PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.15, , [AC_MSG_WARN(
+ [Could not find libsamplerate, necessary for jack output plugin.])
+ enable_jack=no])
+fi
+
+if test "x$enable_jack" = xyes; then
OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
fi
@@ -1197,7 +1205,7 @@ have_solaris=no
have_sun=no
ARCH_DEFINES=""
case "$host" in
- *-*-openbsd* | *-*-netbsd* | *-*-mirbsd*)
+ *-*-netbsd* | *-*-mirbsd*)
have_sun=yes
if test "${is_elf}" = "no"
then
@@ -1205,6 +1213,12 @@ case "$host" in
fi
OUTPUT_PLUGINS="$OUTPUT_PLUGINS sun"
;;
+ *-*-openbsd*)
+ if test "${is_elf}" = "no"
+ then
+ AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
+ fi
+ ;;
*-*-darwin*)
AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
;;
@@ -1558,6 +1572,20 @@ if test "x$enable_lyricwiki" = "xyes"; then
GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
fi
+dnl *** sndio
+
+AC_ARG_ENABLE(sndio,
+ [ --enable-sndio enable sndio output plugin (default=disabled) ],
+ [have_sndio=$enableval],
+ [have_sndio=no]
+)
+
+if test "x$have_sndio" = "xyes"; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
+else
+ have_sndio=no
+fi
+
dnl *** End of all plugin checks ***
AC_SUBST(ARCH_DEFINES)
@@ -1645,7 +1673,7 @@ echo " Open Sound System v4 (oss4): $have_
echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
echo " PulseAudio (pulse): $have_pulse"
echo " RoarAudio (roaraudio): $have_roar"
-echo " Jack Audio Connection Kit (jack): $have_jack"
+echo " Jack Audio Connection Kit (jack): $enable_jack"
echo " BSD/SUN audio output (sun): $have_sun"
echo " Mac OS X sound support (CoreAudio): $have_coreaudio"
echo " FileWriter: $enable_filewriter"
@@ -1653,6 +1681,7 @@ echo " -> FileWriter MP3 output part: $have_
echo " -> FileWriter Vorbis output part: $have_vorbisenc"
echo " -> FileWriter FLAC output part: $have_writer_flac"
echo " Null Audio output (null): yes"
+echo " Sndio Audio output (sndio): $have_sndio"
echo
echo " Input Plugins"
echo " -------------"