From 6a163b452c10ca60d59af267b54b762f02465e89 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Fri, 8 Jul 2005 11:19:19 +0000
Subject: [PATCH] sys/oss/: Port from THREADED+wim's fixes.

Original commit message from CVS:
2005-07-08  Andy Wingo  <wingo@pobox.com>

* sys/oss/: Port from THREADED+wim's fixes.
---
 ChangeLog       |  2 ++
 sys/Makefile.am | 14 ++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3280377b1d..8ec71251b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-07-08  Andy Wingo  <wingo@pobox.com>
 
+	* sys/oss/: Port from THREADED+wim's fixes.
+
 	* gst/avi/Makefile.am (libgstavi_la_CFLAGS): No gettext hacks, the
 	defines come from config.h.
 
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 3b00160356..5406c3130a 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -4,11 +4,11 @@
 # DXR3_DIR=
 # endif
 
-# if USE_OSS
-# OSS_DIR=oss
-# else
+if USE_OSS
+OSS_DIR=oss
+else
 OSS_DIR=
-# endif
+endif
 
 # if USE_OSX_AUDIO
 # OSX_AUDIO_DIR=osxaudio
@@ -34,12 +34,6 @@ OSS_DIR=
 # SUNAUDIO_DIR=
 # endif
 
-# if USE_GST_V4L
-# V4L_DIR=v4l
-# else
-# V4L_DIR=
-# endif
-
 # if USE_GST_V4L2
 # V4L2_DIR=v4l2
 # else