diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-03-12 00:59:54 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-03-12 01:00:05 +0100 |
| commit | 7b0fb9f6d3b7e214c6ef7e62bd021a55c69cf54b (patch) | |
| tree | fc48827ad2dcbcc143917da634213f9f122207b5 /juk/configure.in.in | |
| parent | ca88e18f9e636658d3a9b48a0db67e3357cfd36c (diff) | |
| download | tdemultimedia-7b0fb9f6d3b7e214c6ef7e62bd021a55c69cf54b.tar.gz tdemultimedia-7b0fb9f6d3b7e214c6ef7e62bd021a55c69cf54b.zip | |
Add GStreamer 1.0 support
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4d5e6b99d3c2436c34ca8db9720ab331d0190dce)
Diffstat (limited to 'juk/configure.in.in')
| -rw-r--r-- | juk/configure.in.in | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/juk/configure.in.in b/juk/configure.in.in index f2e48c0c..b74c6d9f 100644 --- a/juk/configure.in.in +++ b/juk/configure.in.in @@ -44,29 +44,34 @@ AC_ARG_WITH(gstreamer, have_gst=no if test "x$with_gstreamer" != xno; then - # pkg-config seems to have a bug where it masks needed -L entries when it + # pkg-config seems to have a bug where it masks needed -L entries when it # shouldn't, so disable that. - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 + PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 export PKG_CONFIG_ALLOW_SYSTEM_LIBS - GST_MAJORMINOR=0.10 - GST_REQ=0.10.0 - GST_VERSION=10 - - PKG_CHECK_MODULES(GST, \ - gstreamer-$GST_MAJORMINOR >= $GST_REQ, \ - have_gst=yes, have_gst=no) + GST_MAJORMINOR=1.0 + GST_REQ=1.0.0 + PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ, have_gst=yes, have_gst=no) if test "x$have_gst" != xyes; then + AC_MSG_RESULT(no) + + GST_MAJORMINOR=0.10 + GST_REQ=0.10.0 + PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ, have_gst=yes, have_gst=no) + + if test "x$have_gst" != xyes; then + AC_MSG_RESULT(no) - GST_MAJORMINOR=0.8 - GST_REQ=0.8.0 - GST_VERSION=8 + GST_MAJORMINOR=0.8 + GST_REQ=0.8.0 + PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ, have_gst=yes, have_gst=no) - PKG_CHECK_MODULES(GST, \ - gstreamer-$GST_MAJORMINOR >= $GST_REQ, \ - have_gst=yes, have_gst=no) + if test "x$have_gst" != xyes; then + AC_MSG_RESULT(no) + fi + fi fi if test "x$with_gstreamer" != xcheck && test "x$have_gst" != xyes; then @@ -90,7 +95,6 @@ else AC_MSG_NOTICE([GStreamer version >= $GST_REQ found.]) AC_DEFINE(HAVE_GSTREAMER, 1, [have GStreamer]) - AC_DEFINE_UNQUOTED(GSTREAMER_VERSION, $GST_VERSION, [GStreamer Version]) fi AC_SUBST(GST_CFLAGS) |