X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=d158fd3de4cc12b117455c4fe41214da756729d5;hp=f783db789781bfc5e40fc48699c8d670fc0d99e3;hb=4dbf56eff63e120c3888fa2badc9fbf930c6ba46;hpb=95abd05e31f10d86d82ae7c3de9d804db9478def

diff --git a/configure.ac b/configure.ac
index f783db78..d158fd3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,27 +467,52 @@ if test ${have_libid3tag} = yes; then
 else
 	AC_MSG_WARN([no support for id3v2 tags])
 fi
+########################################################################### oss
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+
+have_oss="yes"
+msg="=> will not build para_fade/oss writer"
+
+AC_CHECK_HEADER(sys/soundcard.h, [
+	extras="$extras para_fade"
+	all_executables="$all_executables fade"
+	all_errlist_objs="$all_errlist_objs oss_write"
+	audiod_errlist_objs="$audiod_errlist_objs oss_write"
+	audiod_cmdline_objs="$audiod_cmdline_objs oss_write.cmdline"
+
+	write_errlist_objs="$write_errlist_objs oss_write"
+	write_cmdline_objs="$write_cmdline_objs oss_write.cmdline"
+	writers="$writers oss"
+	default_writer="OSS_WRITE"
+	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
+			audiod_ldflags="$audiod_ldflags -lossaudio"
+			write_ldflags="$write_ldflags -lossaudio"
+			fade_ldflags="$write_ldflags -lossaudio"
+		]
+	)
+	],
+	[
+		have_oss="no"
+		AC_MSG_WARN([no linux/soundcard.h $msg])
+	]
+)
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
+
 ########################################################################### alsa
-have_alsa="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
+
+msg="=> no alsa support for para_audiod/para_write"
 if test "$OSTYPE" != "Linux"; then
 	have_alsa="no"
+else
+	have_alsa="yes"
 fi
-msg="=> will not build para_fade"
-if test "$have_alsa" = "yes"; then
-	AC_CHECK_HEADER(linux/soundcard.h, [
-		extras="$extras para_fade"
-		all_executables="$all_executables fade"
-		],
-		[
-			have_alsa="no"
-			AC_MSG_WARN([no linux/soundcard.h $msg])
-		]
-	)
-fi
-msg="=> no alsa support for para_audiod/para_write"
 if test "$have_alsa" = "yes"; then
 	AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
 		have_alsa="no"
@@ -514,6 +539,7 @@ if test "$have_alsa" = "yes"; then
 	writers="$writers alsa"
 	default_writer="ALSA_WRITE"
 fi
+
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
@@ -675,6 +701,7 @@ AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
 	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
 
 AC_SUBST(fade_objs, add_dot_o($fade_objs))
+AC_SUBST(fade_ldflags, $fade_ldflags)
 AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
 	objlist_to_errlist($fade_errlist_objs), errors used by para_fade)
 
@@ -684,7 +711,7 @@ AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS,
 	enum of supported filters)
 inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)"
 AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters)
-array="$(for i in $filters; do printf '{.name = \"'$i'\", .init = '$i'_filter_init},'; done)"
+array="$(for i in $filters; do printf '{.name = "'$i'", .init = '$i'_filter_init},'; done)"
 AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters)
 
 enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"