m4/: fix check for base plugins

Original commit message from CVS:

* m4/Makefile.am:
* m4/gst-check.m4:
fix check for base plugins
* m4/gst-default.m4:
add m4 to set default elements

diff --git a/ChangeLog b/ChangeLog
index 7e561dc..cf1fded 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-14  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * m4/Makefile.am:
+       * m4/gst-check.m4:
+         fix check for base plugins
+       * m4/gst-default.m4:
+         add m4 to set default elements
+
 2005-10-18  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * m4/gst-check.m4:

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 5f5d267..f409f05 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -16,6 +16,7 @@ EXTRA_DIST = \
        gst-args.m4 \
        gst-check.m4 \
        gst-debuginfo.m4 \
+       gst-default.m4 \
        gst-doc.m4 \
        gst-feature.m4 \
        gst-function.m4 \

diff --git a/m4/gst-check.m4 b/m4/gst-check.m4
index c0dcaab..6a5734f 100644 (file)
--- a/m4/gst-check.m4
+++ b/m4/gst-check.m4
@@ -78,6 +78,6 @@ AC_DEFUN([GST_CHECK_GST_CHECK],
 
 AC_DEFUN([GST_CHECK_GST_PLUGINS_BASE],
 [
-  GST_CHECK_MODULES(GST_CHECK, gstreamer-plugins-base-[$1], [$2],
+  GST_CHECK_MODULES(GST_PLUGINS_BASE, gstreamer-plugins-base-[$1], [$2],
     [GStreamer Base Plug-ins Library], [$3])
 ])

diff --git a/m4/gst-default.m4 b/m4/gst-default.m4
new file mode 100644 (file)
index 0000000..438f279
--- /dev/null
+++ b/m4/gst-default.m4
@@ -0,0 +1,45 @@
+dnl default elements used for tests and such
+
+dnl GST_DEFAULT_ELEMENTS
+
+AC_DEFUN([GST_DEFAULT_ELEMENTS],
+[
+  dnl decide on default elements
+  dnl FIXME: provide configure-time options for this
+  dnl FIXME: describe where exactly this gets used
+  dnl FIXME: decide if it's a problem that this could point to sinks from
+  dnl        depending plugin modules
+  DEFAULT_AUDIOSINK="alsasink"
+  DEFAULT_VIDEOSINK="xvimagesink"
+  DEFAULT_AUDIOSRC="alsasrc"
+  DEFAULT_VIDEOSRC="v4lsrc"
+  DEFAULT_VISUALIZER="goom"
+  case "$host" in
+    *-sun-* | *pc-solaris* )
+      DEFAULT_AUDIOSINK="sunaudiosink"
+      DEFAULT_VIDEOSINK="ximagesink"
+      DEFAULT_AUDIOSRC="sunaudiosrc"
+      ;;
+    *-darwin* )
+      DEFAULT_AUDIOSINK="osxaudiosink"
+      DEFAULT_AUDIOSRC="osxaudiosrc"
+      DEFAULT_VIDEOSINK="osxvideosink"
+      ;;
+  esac
+  
+  AC_SUBST(DEFAULT_AUDIOSINK)
+  AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSINK, "$DEFAULT_AUDIOSINK",
+    [Default audio sink])
+  AC_SUBST(DEFAULT_AUDIOSRC)
+  AC_DEFINE_UNQUOTED(DEFAULT_AUDIOSRC, "$DEFAULT_AUDIOSRC",
+    [Default audio source])
+  AC_SUBST(DEFAULT_VIDEOSINK)
+  AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSINK, "$DEFAULT_VIDEOSINK",
+    [Default video sink])
+  AC_SUBST(DEFAULT_VIDEOSRC)
+  AC_DEFINE_UNQUOTED(DEFAULT_VIDEOSRC, "$DEFAULT_VIDEOSRC",
+    [Default video source])
+  AC_SUBST(DEFAULT_VISUALIZER)
+  AC_DEFINE_UNQUOTED(DEFAULT_VISUALIZER, "$DEFAULT_VISUALIZER",
+    [Default visualizer])
+])