Only check for gst-inspect if we haven't already found it in previous element check...

Original commit message from CVS:
Only check for gst-inspect if we haven't already found it in previous element check runs

diff --git a/ChangeLog b/ChangeLog
index 235b24f590ba04f04cc3fb04051518c2dd72c34f..734de3dfea2df4c6c4fc9e65f617d6d2573850d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-25  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst-element-check.m4:
+         Only check for gst-inspect if we haven't already
+         found it in previous element check runs
+
 2005-01-25  Stefan Kost  <ensonic@users.sf.net>
 
        * docs/gst/Makefile.am:

diff --git a/gst-element-check.m4 b/gst-element-check.m4
index 005d584978f83b3d8ed5f88c3fd573b2fd29bb71..e608f195d09dd5c6f5920834f856d7bdfe2240c9 100644 (file)
--- a/gst-element-check.m4
+++ b/gst-element-check.m4
@@ -1,12 +1,15 @@
 dnl Perform a check for a GStreamer element using gst-inspect
 dnl Thomas Vander Stichele <thomas at apestaart dot org>
-dnl Last modification: 23/10/2002
+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],
 [
-  AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
+  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

diff --git a/gst-element-check.m4.in b/gst-element-check.m4.in
index 005d584978f83b3d8ed5f88c3fd573b2fd29bb71..e608f195d09dd5c6f5920834f856d7bdfe2240c9 100644 (file)
--- a/gst-element-check.m4.in
+++ b/gst-element-check.m4.in
@@ -1,12 +1,15 @@
 dnl Perform a check for a GStreamer element using gst-inspect
 dnl Thomas Vander Stichele <thomas at apestaart dot org>
-dnl Last modification: 23/10/2002
+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],
 [
-  AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
+  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