[gnome-dvb-daemon/gst-1.0: 1/4] Updated build system

[Sebastian Polsterl <sebp src gnome org>]

commit 7e91341ecfa7dcc4f87538497af380c56373f205
Author: Sebastian Pölsterl <sebp k-d-w org>
Date:   Mon Mar 11 20:18:06 2013 +0100

    Updated build system

 Makefile.am     |    8 ++++----
 configure.ac    |   16 ++++++++--------
 m4/gstreamer.m4 |   20 ++++++++++----------
 3 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index eef5c32..5e7f7d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,10 +71,10 @@ gnome_dvb_daemon_SOURCES = \
 
 vala_pkgs = \
        --pkg gio-2.0 \
-       --pkg gstreamer-0.10 \
-       --pkg gee-1.0 \
+       --pkg gstreamer-1.0 \
+       --pkg gee-0.8 \
        --pkg sqlite3 \
-       --pkg gst-rtsp-server-0.10 \
+       --pkg gstreamer-rtsp-server-1.0 \
        --pkg gudev-1.0 \
        $(NULL)
     
@@ -93,7 +93,7 @@ gnome_dvb_daemon_CPPFLAGS = \
        -include $(CONFIG_HEADER) \
        $(NULL)
 
-VALAFLAGS = --target-glib=2.32 --vapidir=$(top_srcdir)/vapi $(own_pkgs) $(vala_pkgs) --basedir $(top_srcdir)
+AM_VALAFLAGS = --target-glib=2.32 --vapidir=$(top_srcdir)/vapi $(own_pkgs) $(vala_pkgs) --basedir 
$(top_srcdir)
 
 gnome_dvb_daemon_LDFLAGS = \
        -Wl,--export-dynamic
diff --git a/configure.ac b/configure.ac
index 5206d65..18e14a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,22 +60,22 @@ dnl ******************
 dnl * Check for libs
 dnl ******************
 GLIB_REQUIRED=2.32.0
-GST_REQUIRED=0.10.29
-GEE_REQUIRED=0.5.0
+GST_REQUIRED=1.0
+GEE_REQUIRED=0.8.0
 SQLITE_REQUIRED=3.4
-GST_RTSP_SERVER_REQUIRED=0.10.7
+GST_RTSP_SERVER_REQUIRED=0.11.90
 
-PKG_CHECK_MODULES(GST, gstreamer-0.10 >= $GST_REQUIRED
-                       gstreamer-rtsp-0.10 >= $GST_REQUIRED)
+PKG_CHECK_MODULES(GST, gstreamer-1.0 >= $GST_REQUIRED
+                       gstreamer-rtsp-1.0 >= $GST_REQUIRED)
 AC_SUBST(GST_CFLAGS)
 AC_SUBST(GST_LIBS)
 
 PKG_CHECK_MODULES(GNOME_DVB_DAEMON, glib-2.0 >= $GLIB_REQUIRED
                             gio-2.0 >= $GLIB_REQUIRED
                             gobject-2.0 >= $GLIB_REQUIRED
-                            gee-1.0 >= $GEE_REQUIRED
+                            gee-0.8 >= $GEE_REQUIRED
                             sqlite3 >= $SQLITE_REQUIRED
-                            gst-rtsp-server-0.10 >= $GST_RTSP_SERVER_REQUIRED)
+                            gstreamer-rtsp-server-1.0 >= $GST_RTSP_SERVER_REQUIRED)
 AC_SUBST(GNOME_DVB_DAEMON_CFLAGS)
 AC_SUBST(GNOME_DVB_DAEMON_LIBS)
 
@@ -88,7 +88,7 @@ AC_SUBST(GUDEV_CFLAGS)
 AC_SUBST(GUDEV_LIBS)
 
 AG_GST_CHECK_GST_INSPECT
-AG_GST_CHECK_MODULE_BAD([mpegtsparse])
+AG_GST_CHECK_MODULE_BAD([tsparse])
 AG_GST_CHECK_MODULE_BAD([dvbbasebin])
 AG_GST_CHECK_MODULE_BAD([dvbsrc])
 AG_GST_CHECK_MODULE_GOOD([rtpmp2tpay])
diff --git a/m4/gstreamer.m4 b/m4/gstreamer.m4
index 279ad1a..d8c6efc 100644
--- a/m4/gstreamer.m4
+++ b/m4/gstreamer.m4
@@ -1,25 +1,25 @@
 dnl Checks for gstreamer modules (code from Totem)
 dnl AG_GST_CHECK_GST_INSPECT
-dnl   check for gst-inspect-0.10
+dnl   check for gst-inspect-1.0
 dnl
 dnl AG_GST_CHECK_MODULE_BAD([MODULE])
 dnl   check for module from gst-plugins-bad
 
 AC_DEFUN([AG_GST_CHECK_GST_INSPECT],
 [
-       gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
-       GST_INSPECT="$gst010_toolsdir/gst-inspect-0.10"
+       gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-1.0`
+       GST_INSPECT="$gst010_toolsdir/gst-inspect-1.0"
 
        dnl Give error and exit if we don't have the gst_inspect tool
-       AC_MSG_CHECKING([GStreamer 0.10 inspection tool])
+       AC_MSG_CHECKING([GStreamer 1.0 inspection tool])
        if test -r "$GST_INSPECT"; then
                AC_MSG_RESULT([yes])
                AC_SUBST(GST_INSPECT)
        else
                AC_MSG_RESULT([no])
                AC_MSG_ERROR([
-Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'.
-It should be part of gstreamer-0_10-utils. Please install it.
+Cannot find required GStreamer-1.0 tool 'gst-inspect-1.0'.
+It should be part of gstreamer-1_0-utils. Please install it.
                ])
        fi
 ])
@@ -28,13 +28,13 @@ AC_DEFUN([AG_GST_CHECK_MODULE_BAD],
 [
        base_element="[$1]"
        
-    AC_MSG_CHECKING([GStreamer 0.10 $base_element plugin])
+    AC_MSG_CHECKING([GStreamer 1.0 $base_element plugin])
        if $GST_INSPECT $base_element >/dev/null 2>/dev/null; then
                AC_MSG_RESULT([yes])
        else
                AC_MSG_RESULT([no])
                AC_MSG_ERROR([
-Cannot find required GStreamer-0.10 plugin '$base_element'.
+Cannot find required GStreamer-1.0 plugin '$base_element'.
 It should be part of gst-plugins-bad. Please install it.
                ])
        fi
@@ -44,13 +44,13 @@ AC_DEFUN([AG_GST_CHECK_MODULE_GOOD],
 [
        base_element="[$1]"
        
-    AC_MSG_CHECKING([GStreamer 0.10 $base_element plugin])
+    AC_MSG_CHECKING([GStreamer 1.0 $base_element plugin])
        if $GST_INSPECT $base_element >/dev/null 2>/dev/null; then
                AC_MSG_RESULT([yes])
        else
                AC_MSG_RESULT([no])
                AC_MSG_ERROR([
-Cannot find required GStreamer-0.10 plugin '$base_element'.
+Cannot find required GStreamer-1.0 plugin '$base_element'.
 It should be part of gst-plugins-good. Please install it.
                ])
        fi