summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-05-20 19:56:27 +0000
committerDavid Schleef <ds@schleef.org>2004-05-20 19:56:27 +0000
commit81635cbcc7caf5ae42a9a6b642829f5845cce786 (patch)
tree5ac726b21236e96fdd005903bf1fbcb2c6149572
parent071573ca193b0c1cba12a8e6c74c4d1b30406ef4 (diff)
downloadgst-plugins-bad-81635cbcc7caf5ae42a9a6b642829f5845cce786.tar.gz
gst-plugins-bad-81635cbcc7caf5ae42a9a6b642829f5845cce786.tar.bz2
gst-plugins-bad-81635cbcc7caf5ae42a9a6b642829f5845cce786.zip
Original commit message from CVS:
* configure.ac: * sys/Makefile.am:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac7
-rw-r--r--sys/Makefile.am14
3 files changed, 23 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e092ae0a..f563cf35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2004-05-20 David Schleef <ds@schleef.org>
+ * configure.ac:
+ * sys/Makefile.am:
+
+2004-05-20 David Schleef <ds@schleef.org>
+
* sys/osxaudio/Makefile.am: New OS X audio plugin by Zaheer Merali
* sys/osxaudio/gstosxaudio.c:
* sys/osxaudio/gstosxaudioelement.c:
diff --git a/configure.ac b/configure.ac
index 6bc8d98b..446da114 100644
--- a/configure.ac
+++ b/configure.ac
@@ -448,6 +448,12 @@ GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
AC_CHECK_HEADER(sys/soundcard.h, HAVE_OSS="yes", HAVE_OSS="no")
])
+dnl *** OS X audio ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_OSX_AUDIO, true)
+GST_CHECK_FEATURE(OSX_AUDIO, [OSX audio], osxaudiosrc osxaudiosink, [
+ AC_CHECK_HEADER(CoreAudio/CoreAudio.h, HAVE_OSX_AUDIO="yes", HAVE_OSX_AUDIO="no")
+])
+
dnl *** QuickCam ***
translit(dnm, m, l) AM_CONDITIONAL(USE_QCAM, true)
GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, [
@@ -1793,6 +1799,7 @@ sys/cdrom/Makefile
sys/dxr3/Makefile
sys/glsink/Makefile
sys/oss/Makefile
+sys/osxaudio/Makefile
sys/qcam/Makefile
sys/sunaudio/Makefile
sys/v4l/Makefile
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 96563de0..b2631c5e 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -10,6 +10,12 @@ else
OSS_DIR=
endif
+if USE_OSX_AUDIO
+OSX_AUDIO_DIR=osxaudio
+else
+OSX_AUDIO_DIR=
+endif
+
if USE_QCAM
QCAM_DIR=qcam
else
@@ -58,7 +64,9 @@ else
CDROM_DIR=
endif
-SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(SUNAUDIO_DIR) $(QCAM_DIR) $(V4L_DIR) \
- $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) $(XI_DIR) $(XV_DIR)
+SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(QCAM_DIR) $(SUNAUDIO_DIR) \
+ $(V4L_DIR) $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) $(XI_DIR) $(XV_DIR)
+
+DIST_SUBDIRS=dxr3 oss osxaudio qcam sunaudio v4l v4l2 vcd ximage xvimage \
+ glsink cdrom
-DIST_SUBDIRS=dxr3 oss qcam sunaudio v4l v4l2 vcd ximage xvimage glsink cdrom