From 4554864e65b317622d9c334e406bd3311e0bb4ee Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Thu, 10 Mar 2005 18:12:40 +0000
Subject: [PATCH] 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.
---
 ChangeLog               |  8 ++++++++
 Makefile.am             |  3 ++-
 configure.ac            |  1 +
 gst-element-check.m4    | 23 -----------------------
 gst-element-check.m4.in |  2 +-
 5 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 gst-element-check.m4

diff --git a/ChangeLog b/ChangeLog
index 5b0410f12d..413767f32f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
diff --git a/Makefile.am b/Makefile.am
index aa4111ecb7..40d9550b2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,8 @@ win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
 debug:
 	echo $(win32)
 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 \
 	REQUIREMENTS ABOUT-NLS DOCBUILDING DEVEL RELEASE \
 	$(win32) \
diff --git a/configure.ac b/configure.ac
index 4249a7daa3..2844e0fe12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -728,6 +728,7 @@ pkgconfig/gstreamer.pc
 pkgconfig/gstreamer-uninstalled.pc
 pkgconfig/gstreamer-control.pc
 pkgconfig/gstreamer-control-uninstalled.pc
+gst-element-check.m4
 gstreamer.spec,
 echo "$infomessages", infomessages="$infomessages"
 )
diff --git a/gst-element-check.m4 b/gst-element-check.m4
deleted file mode 100644
index e608f195d0..0000000000
--- a/gst-element-check.m4
+++ /dev/null
@@ -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
-])
diff --git a/gst-element-check.m4.in b/gst-element-check.m4.in
index e608f195d0..9910b09492 100644
--- a/gst-element-check.m4.in
+++ b/gst-element-check.m4.in
@@ -7,7 +7,7 @@ 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, [])
+    AC_CHECK_PROG(GST_INSPECT, gst-inspect-@GST_MAJORMINOR@, gst-inspect-@GST_MAJORMINOR@, [])
   fi
 
   if test "x$GST_INSPECT" != "x"; then