73 lines
2.4 KiB
Plaintext
73 lines
2.4 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.13 2012/06/08 14:44:55 dcoppa Exp $
|
|
--- configure.ac.orig Sat May 26 13:43:44 2012
|
|
+++ configure.ac Fri Jun 8 11:00:09 2012
|
|
@@ -41,9 +41,6 @@ PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.2],
|
|
[AC_MSG_ERROR([Cannot find Audacious 3.2; have you installed Audacious yet?])]
|
|
)
|
|
|
|
-CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
|
|
-LIBS="$LIBS $AUDACIOUS_LIBS"
|
|
-
|
|
dnl Default Set of Plugins
|
|
dnl ======================
|
|
|
|
@@ -95,7 +92,7 @@ dnl ===============
|
|
PTHREAD_LIBS=
|
|
PTHREAD_CFLAGS=
|
|
|
|
-AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS="-lpthread",
|
|
+AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS="-pthread",
|
|
[AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIBS="-lpthreads",
|
|
[AC_CHECK_LIB(pthreadGC2, pthread_create, PTHREAD_LIBS="-lpthreadGC2")]
|
|
)]
|
|
@@ -963,7 +960,7 @@ AC_ARG_ENABLE(filewriter_mp3,
|
|
)
|
|
|
|
if test "x$enable_filewriter_mp3" = "xyes"; then
|
|
- AC_CHECK_LIB(mp3lame -lm, lame_get_id3v2_tag, [have_lame=yes], [have_lame=no])
|
|
+ AC_CHECK_LIB(mp3lame, lame_get_id3v2_tag, [have_lame=yes], [have_lame=no])
|
|
if test "x$have_lame" = "xyes"; then
|
|
AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built])
|
|
FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
|
|
@@ -1077,8 +1074,32 @@ if test "x$enable_lyricwiki" = "xyes"; then
|
|
GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
|
|
fi
|
|
|
|
+dnl *** sndio output
|
|
+
|
|
+AC_ARG_ENABLE(sndio,
|
|
+ [ --disable-sndio disable sndio output plugin (default=enabled) ],
|
|
+ [have_sndio=$enableval],
|
|
+ [have_sndio=yes]
|
|
+)
|
|
+
|
|
+if test "x$have_sndio" = "xyes"; then
|
|
+ AC_CHECK_HEADER(sndio.h,, have_sndio=no)
|
|
+ if test x$have_sndio = xyes; then
|
|
+ AC_CHECK_LIB(sndio, sio_open, haves_sndio=yes, have_sndio=no)
|
|
+ fi
|
|
+fi
|
|
+
|
|
+if test "x$have_sndio" = "xyes"; then
|
|
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
|
|
+ SNDIO_LIBS="-lsndio"
|
|
+ AC_SUBST(SNDIO_LIBS)
|
|
+fi
|
|
+
|
|
dnl *** End of all plugin checks ***
|
|
|
|
+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
|
|
+LIBS="$LIBS $AUDACIOUS_LIBS"
|
|
+
|
|
plugindir=`pkg-config audacious --variable=plugin_dir`
|
|
AC_SUBST(plugindir)
|
|
|
|
@@ -1148,6 +1169,7 @@ echo " -> FileWriter Vorbis output part: $enabl
|
|
echo " -> FileWriter FLAC output part: $have_writer_flac"
|
|
echo " Null Audio output (null): yes"
|
|
echo " Open Sound System v3 (deprecated): $enable_oss"
|
|
+echo " Sndio Audio output (sndio): $have_sndio"
|
|
echo
|
|
echo " Input Plugins"
|
|
echo " -------------"
|