summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--sys/Makefile.am14
2 files changed, 6 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 3280377b..8ec71251 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 3b001603..5406c313 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