configure.ac: Add sunaudio

Original commit message from CVS:
* configure.ac: Add sunaudio
* examples/Makefile.am: make gstplay depend on gconf
* gst/ffmpegcolorspace/gstffmpegcodecmap.c: Remove c99-isms
* gst/ffmpegcolorspace/imgconvert.c: (build_rgb_palette),
(convert_table_lookup), (img_convert): remove c99-isms
* gst/ffmpegcolorspace/imgconvert_template.h: make a constant
unsigned, to fix a warning on Solaris
* gst/mpeg1sys/systems.c: bcopy->memcpy
* gst/rtjpeg/RTjpeg.c: (RTjpeg_yuvrgb8): bcopy->memcpy
* sys/Makefile.am: Add sunaudio

diff --git a/ChangeLog b/ChangeLog
index ea1a917002c3b6962b3147dac0de116faa50f5ce..3f1cffe0dfa04add8a0440dd4f8ea1612bd7a6ae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-05-18  David Schleef  <ds@schleef.org>
+
+       * configure.ac: Add sunaudio
+       * examples/Makefile.am: make gstplay depend on gconf
+       * gst/ffmpegcolorspace/gstffmpegcodecmap.c: Remove c99-isms
+       * gst/ffmpegcolorspace/imgconvert.c: (build_rgb_palette),
+       (convert_table_lookup), (img_convert): remove c99-isms
+       * gst/ffmpegcolorspace/imgconvert_template.h: make a constant
+          unsigned, to fix a warning on Solaris
+       * gst/mpeg1sys/systems.c: bcopy->memcpy
+       * gst/rtjpeg/RTjpeg.c: (RTjpeg_yuvrgb8): bcopy->memcpy
+       * sys/Makefile.am: Add sunaudio
+
 2004-05-18  Wim Taymans  <wim@fluendo.com>
 
        * ext/ogg/gstoggmux.c: (gst_ogg_mux_get_type), (gst_ogg_mux_init),

diff --git a/configure.ac b/configure.ac
index e9ba371521060467dd48b5d056ab323fca2d0ef7..ee312d3dd79896929b0310146fafe0b6b0342538 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -461,6 +461,12 @@ GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, [
   fi
 ])
 
+dnl *** Sun Audio ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_SUNAUDIO, true)
+GST_CHECK_FEATURE(SUNAUDIO, [Sun Audio], sunaudiosrc, [
+  AC_CHECK_HEADER(sys/audioio.h, HAVE_SUNAUDIO="yes", HAVE_SUNAUDIO="no")
+])
+
 dnl *** Video CD ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_VCD, true)
 GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
@@ -1786,6 +1792,7 @@ sys/dxr3/Makefile
 sys/glsink/Makefile
 sys/oss/Makefile
 sys/qcam/Makefile
+sys/sunaudio/Makefile
 sys/v4l/Makefile
 sys/v4l2/Makefile
 sys/vcd/Makefile

diff --git a/examples/Makefile.am b/examples/Makefile.am
index d2537f2922174afb4552c254c56eec6b0658dbeb..0c8190c7b1a71ce710983511523972d43a65ae78 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -10,5 +10,11 @@ else
 GTK_SUBDIRS=
 endif
 
-SUBDIRS=$(GTK_SUBDIRS) gstplay switch
+if USE_GCONF
+GCONF_SUBDIRS=gstplay
+else
+GCONF_SUBDIRS=
+endif
+
+SUBDIRS=$(GTK_SUBDIRS) $(GCONF_SUBDIRS) switch
 DIST_SUBDIRS=capsfilter dynparams seeking indexing gstplay switch