diff options
| author | Andy Wingo <wingo@pobox.com> | 2005-07-08 11:19:19 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2005-07-08 11:19:19 +0000 |
| commit | 6a163b452c10ca60d59af267b54b762f02465e89 (patch) | |
| tree | e886741b437c60c2b2c9958191ff55a1a9c30d11 | |
| parent | ae4309d00ca64b72be1327e166c00324656f8f82 (diff) | |
| download | gst-plugins-bad-6a163b452c10ca60d59af267b54b762f02465e89.tar.gz gst-plugins-bad-6a163b452c10ca60d59af267b54b762f02465e89.tar.bz2 gst-plugins-bad-6a163b452c10ca60d59af267b54b762f02465e89.zip | |
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.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | sys/Makefile.am | 14 |
2 files changed, 6 insertions, 10 deletions
@@ -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 |