[Thoggen-cvs] SF.net SVN: thoggen: [242] trunk/thoggen

[<tp...@us...>]

Revision: 242
          http://svn.sourceforge.net/thoggen/?rev=242&view=rev
Author:   tp-m
Date:     2006-10-06 03:35:00 -0700 (Fri, 06 Oct 2006)

Log Message:
-----------
* macros/thoggen-gst-element-check.m4:
Fix version check for elements with a version of 0.10.10 or similar.
Sadly, sed doesn't appear to support non-greedy matching, but we
still need to make sure we don't match too much.

Modified Paths:
--------------
    trunk/thoggen/ChangeLog
    trunk/thoggen/macros/thoggen-gst-element-check.m4

Modified: trunk/thoggen/ChangeLog
===================================================================
--- trunk/thoggen/ChangeLog	2006-10-06 09:58:05 UTC (rev 241)
+++ trunk/thoggen/ChangeLog	2006-10-06 10:35:00 UTC (rev 242)
@@ -1,5 +1,12 @@
 2006-10-06  Tim-Philipp Müller  <tim at centricular dot net>
 
+	* macros/thoggen-gst-element-check.m4:
+	  Fix version check for elements with a version of 0.10.10 or similar.
+	  Sadly, sed doesn't appear to support non-greedy matching, but we
+	  still need to make sure we don't match too much.
+
+2006-10-06  Tim-Philipp Müller  <tim at centricular dot net>
+
 	* src/th-job.c:
         (job_set_property):
         (job_queue_set_limits):

Modified: trunk/thoggen/macros/thoggen-gst-element-check.m4
===================================================================
--- trunk/thoggen/macros/thoggen-gst-element-check.m4	2006-10-06 09:58:05 UTC (rev 241)
+++ trunk/thoggen/macros/thoggen-gst-element-check.m4	2006-10-06 10:35:00 UTC (rev 242)
@@ -43,7 +43,9 @@
     AC_MSG_CHECKING(for GStreamer-$1 element $2 (>= $3))
     if [ $th_gstmajmin_inspect $2 > /dev/null 2> /dev/null ]; then
       dnl found it, let's check the versions
-      th_element_version=`$th_gstmajmin_inspect $2 | $GREP Version | $SED 's/^.*$1/$1/'`
+      dnl sed can't do non-greedy matching it appears, so take care with
+      dnl version numbers like 0.10.10.1 etc. if major version is 0.10
+      th_element_version=`$th_gstmajmin_inspect $2 | $GREP Version | $SED 's/^.*\s$1/$1/'`
       found_version_rest=`echo $th_element_version | $SED 's/^$1\.//'`
       min_version_rest=`echo $3 | $SED 's/^$1\.//'`
       if echo | $AWK "{ if ($found_version_rest < $min_version_rest) exit 1; else exit 0;}";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.