Call gst-inspect-$VERSION instead of gst-inspect. Fixes #168659.

Original commit message from CVS:
* Makefile.am:
* configure.ac:
* gst-element-check.m4:
* gst-element-check.m4.in:
Call gst-inspect-$VERSION instead of gst-inspect. Fixes #168659.
This commit is contained in:
Ronald S. Bultje 2005-03-10 18:12:40 +00:00
parent 09226e160e
commit 4554864e65
5 changed files with 12 additions and 25 deletions

View file

@ -1,3 +1,11 @@
2005-03-10 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* Makefile.am:
* configure.ac:
* gst-element-check.m4:
* gst-element-check.m4.in:
Call gst-inspect-$VERSION instead of gst-inspect. Fixes #168659.
2005-03-10 Jean de Largentaye <jlargentaye@gmail.com> 2005-03-10 Jean de Largentaye <jlargentaye@gmail.com>
Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>

View file

@ -52,7 +52,8 @@ win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
debug: debug:
echo $(win32) echo $(win32)
EXTRA_DIST = \ EXTRA_DIST = \
gstreamer.spec gstreamer.spec.in gst-element-check.m4 \ gstreamer.spec gstreamer.spec.in \
gst-element-check.m4 gst-element-check.m4.in \
configure.ac autogen.sh depcomp \ configure.ac autogen.sh depcomp \
REQUIREMENTS ABOUT-NLS DOCBUILDING DEVEL RELEASE \ REQUIREMENTS ABOUT-NLS DOCBUILDING DEVEL RELEASE \
$(win32) \ $(win32) \

View file

@ -728,6 +728,7 @@ pkgconfig/gstreamer.pc
pkgconfig/gstreamer-uninstalled.pc pkgconfig/gstreamer-uninstalled.pc
pkgconfig/gstreamer-control.pc pkgconfig/gstreamer-control.pc
pkgconfig/gstreamer-control-uninstalled.pc pkgconfig/gstreamer-control-uninstalled.pc
gst-element-check.m4
gstreamer.spec, gstreamer.spec,
echo "$infomessages", infomessages="$infomessages" echo "$infomessages", infomessages="$infomessages"
) )

View file

@ -1,23 +0,0 @@
dnl Perform a check for a GStreamer element using gst-inspect
dnl Thomas Vander Stichele <thomas at apestaart dot org>
dnl Last modification: 25/01/2005
dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
AC_DEFUN([AM_GST_ELEMENT_CHECK],
[
if test "x$GST_INSPECT" == "x"; then
AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
fi
if test "x$GST_INSPECT" != "x"; then
AC_MSG_CHECKING(GStreamer element $1)
if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
AC_MSG_RESULT(found.)
$2
else
AC_MSG_RESULT(not found.)
$3
fi
fi
])

View file

@ -7,7 +7,7 @@ dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
AC_DEFUN([AM_GST_ELEMENT_CHECK], AC_DEFUN([AM_GST_ELEMENT_CHECK],
[ [
if test "x$GST_INSPECT" == "x"; then if test "x$GST_INSPECT" == "x"; then
AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, []) AC_CHECK_PROG(GST_INSPECT, gst-inspect-@GST_MAJORMINOR@, gst-inspect-@GST_MAJORMINOR@, [])
fi fi
if test "x$GST_INSPECT" != "x"; then if test "x$GST_INSPECT" != "x"; then