[Thoggen-cvs] SF.net SVN: thoggen: [237] trunk/thoggen
Status: Beta
Brought to you by:
tp-m
Menu
▾
▴
[Thoggen-cvs] SF.net SVN: thoggen: [237] trunk/thoggen
|
From: <tp...@us...> - 2006-09-06 13:24:17
|
Revision: 237
http://svn.sourceforge.net/thoggen/?rev=237&view=rev
Author: tp-m
Date: 2006-09-06 06:24:11 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
* configure.ac:
* macros/thoggen-gst-element-check.m4:
Check versions of required elements in configure already.
Modified Paths:
--------------
trunk/thoggen/ChangeLog
trunk/thoggen/configure.ac
trunk/thoggen/macros/thoggen-gst-element-check.m4
Modified: trunk/thoggen/ChangeLog
===================================================================
--- trunk/thoggen/ChangeLog 2006-09-06 13:18:06 UTC (rev 236)
+++ trunk/thoggen/ChangeLog 2006-09-06 13:24:11 UTC (rev 237)
@@ -1,6 +1,12 @@
2006-09-06 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
+ * macros/thoggen-gst-element-check.m4:
+ Check versions of required elements in configure already.
+
+2006-09-06 Tim-Philipp Müller <tim at centricular dot net>
+
+ * configure.ac:
Add new translations.
2006-08-24 Tim-Philipp Müller <tim at centricular dot net>
Modified: trunk/thoggen/configure.ac
===================================================================
--- trunk/thoggen/configure.ac 2006-09-06 13:18:06 UTC (rev 236)
+++ trunk/thoggen/configure.ac 2006-09-06 13:24:11 UTC (rev 237)
@@ -1,7 +1,8 @@
-AC_INIT(configure.ac)
+AC_INIT(thoggen, 0.5.99)
+AC_CONFIG_SRCDIR(src/th-job.c)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(thoggen, 0.5.99)
+AM_INIT_AUTOMAKE
dnl ==============================================
@@ -41,8 +42,8 @@
gtk_required="2.8.0"
libglade_required="2.4.0"
gstreamer_required="0.10.4"
-gstpluginsbase_required="0.10.5"
-gstpluginsgood_required="0.10.2"
+gstpluginsbase_required="0.10.7"
+gstpluginsgood_required="0.10.4"
gstpluginsugly_required="0.10.4"
dbus_required="0.36"
libhal_required="0.5.0"
@@ -436,7 +437,7 @@
dnl === check for required elements that
dnl === ship with the GStreamer core (for fun)
-for coreelement in queue identity fakesink filesrc
+for coreelement in queue identity fakesink filesrc filesink
do
THOGGEN_GST_ELEMENT_CHECK([0.10], [$coreelement],,[AC_MSG_ERROR(
[
@@ -455,16 +456,16 @@
dnl check for required plugins from gst-plugins-base
dnl ==============================================================
-THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [audioresample], [gstreamer0.10-plugins-base],[])
-THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [audioconvert], [gstreamer0.10-plugins-base],[])
-THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [ffmpegcolorspace],[gstreamer0.10-plugins-base],[])
-THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [videorate], [gstreamer0.10-plugins-base],[])
+THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [audioresample], [$gstpluginsbase_required], [gstreamer0.10-plugins-base],[])
+THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [audioconvert], [$gstpluginsbase_required], [gstreamer0.10-plugins-base],[])
+THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [ffmpegcolorspace],[$gstpluginsbase_required], [gstreamer0.10-plugins-base],[])
+THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [videorate], [$gstpluginsbase_required], [gstreamer0.10-plugins-base],[])
dnl ==============================================================
dnl check for required plugins from gst-plugins-good
dnl ==============================================================
-THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [videobox],[gstreamer0.10-plugins-good],[])
+THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [videobox], [$gstpluginsgood_required], [gstreamer0.10-plugins-good],[])
dnl ==============================================================
dnl check for required plugins from gstreamer0.10-elsewhere
@@ -480,25 +481,25 @@
dnl ==============================================================
if test "x$CHECK_FOR_MPEG2DEC" == "xyes"; then
- THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [mpeg2dec],[gstreamer0.10-plugins-ugly],[])
+ THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [mpeg2dec], [$gstpluginsugly_required], [gstreamer0.10-plugins-ugly],[])
fi
if test "x$CHECK_FOR_A52DEC" == "xyes"; then
- THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [a52dec],[gstreamer0.10-plugins-ugly],[])
+ THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [a52dec], [$gstpluginsugly_required], [gstreamer0.10-plugins-ugly],[])
fi
if test "x$CHECK_FOR_DVDDEMUX" == "xyes"; then
- THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [dvddemux],[gstreamer0.10-plugins-ugly],[])
+ THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [dvddemux], [$gstpluginsugly_required], [gstreamer0.10-plugins-ugly],[])
fi
if test "x$CHECK_FOR_DVDREADSRC" == "xyes"; then
- THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [dvdreadsrc],[gstreamer0.10-plugins-ugly],[])
+ THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [dvdreadsrc], [$gstpluginsugly_required], [gstreamer0.10-plugins-ugly],[])
fi
if test "x$CHECK_FOR_OGGTHEORA" == "xyes"; then
- THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [theoraenc],[gstreamer0.10-plugins-base],[])
- THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [vorbisenc],[gstreamer0.10-plugins-base],[])
- THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [oggmux], [gstreamer0.10-plugins-base],[])
+ THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [theoraenc], [$gstpluginsbase_required], [gstreamer0.10-plugins-base],[])
+ THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [vorbisenc], [$gstpluginsbase_required], [gstreamer0.10-plugins-base],[])
+ THOGGEN_GST_ELEMENT_CHECK_REQUIRED([0.10], [oggmux], [$gstpluginsbase_required], [gstreamer0.10-plugins-base],[])
fi
dnl ====================
Modified: trunk/thoggen/macros/thoggen-gst-element-check.m4
===================================================================
--- trunk/thoggen/macros/thoggen-gst-element-check.m4 2006-09-06 13:18:06 UTC (rev 236)
+++ trunk/thoggen/macros/thoggen-gst-element-check.m4 2006-09-06 13:24:11 UTC (rev 237)
@@ -27,27 +27,51 @@
dnl towards the right package if the element was not found
dnl ========================================================
-dnl THOGGEN_GST_ELEMENT_CHECK_REQUIRED(GST-MAJOR-MINOR, ELEMENT-NAME, DEBIAN_PKG_NAME, ACTION-IF-FOUND)
+dnl THOGGEN_GST_ELEMENT_CHECK_REQUIRED(GST-MAJOR-MINOR, ELEMENT-NAME, MIN-ELEMENT-VERSION, DEBIAN_PKG_NAME, ACTION-IF-FOUND)
AC_DEFUN([THOGGEN_GST_ELEMENT_CHECK_REQUIRED],
[
+ dnl check for stuff we use first
+ AC_BEFORE([AC_PROG_AWK])
+ AC_BEFORE([AC_PATH_PROG],[PKG_CONFIG], [pkg-config], [no])
+
+
th_gstmajmin_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-$1`
th_gstmajmin_inspect="$th_gstmajmin_toolsdir/gst-inspect-$1"
if test "x$th_gstmajmin_inspect" != "x"; then
- AC_MSG_CHECKING(for GStreamer-$1 element $2)
+ AC_MSG_CHECKING(for GStreamer-$1 element $2 (>= $3))
if [ $th_gstmajmin_inspect $2 > /dev/null 2> /dev/null ]; then
- AC_MSG_RESULT(found.)
- $4
+ dnl found it, let's check the versions
+ th_element_version=`$th_gstmajmin_inspect $2 | $GREP Version | $SED '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;}";
+ then
+ AC_MSG_RESULT([found])
+ $5
+ else
+ AC_MSG_RESULT([found, but too old])
+ AC_MSG_ERROR([
+ GStreamer-$1 plugin '$2' was found, but a newer version
+ of this plugin is required. Please upgrade first.
+
+ Required version: $3, found version: $th_element_version.
+
+ The name of the package you need to upgrade varies among
+ distros/systems. Debian and Ubuntu users will need to
+ upgrade or install the $4 package.
+ ])
+ fi
else
- AC_MSG_RESULT(not found.)
+ AC_MSG_RESULT([NOT FOUND])
AC_MSG_ERROR([
GStreamer-$1 plugin '$2' not found. This plugin is
absolutely required. Please install it.
The name of the package you need to install varies among
distros/systems. Debian and Ubuntu users will need to
- install the $3 package.
+ install the $4 package.
])
fi
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|