Makefile: Don't hardcode libtool for g-i build

[platform/upstream/gstreamer.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0fc1f01..9d6790b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.69)
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT([GStreamer RTSP Server Library], [1.13.90],
+AC_INIT([GStreamer RTSP Server Library], [1.15.0.1],
     [http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],
     [gst-rtsp-server])
 AG_GST_INIT
@@ -53,13 +53,13 @@ dnl      1.2.5 => 205
 dnl      1.10.9 (who knows) => 1009
 dnl
 dnl sets GST_LT_LDFLAGS
-AS_LIBTOOL(GST, 1390, 0, 1390)
+AS_LIBTOOL(GST, 1500, 0, 1500)
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=1.13.90
-GSTPB_REQ=1.13.90
-GSTPG_REQ=1.13.90
-GSTPD_REQ=1.13.90
+GST_REQ=1.15.0.1
+GSTPB_REQ=1.15.0.1
+GSTPG_REQ=1.15.0.1
+GSTPD_REQ=1.15.0.1
 
 dnl *** autotools stuff ****
 
@@ -176,19 +176,12 @@ AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], [yes])
 AG_GST_CHECK_GST_NET($GST_API_VERSION, [$GST_REQ], yes)
 
 AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], [yes])
-GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_API_VERSION --variable pluginsdir`
-AC_SUBST(GSTPB_PLUGINS_DIR)
-AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR)
-
-AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [$GSTPG_REQ], [yes])
-GSTPG_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-good-$GST_API_VERSION --variable pluginsdir`
-AC_SUBST(GSTPG_PLUGINS_DIR)
-AC_MSG_NOTICE(Using GStreamer Good Plugins in $GSTPG_PLUGINS_DIR)
-
-AG_GST_CHECK_GST_PLUGINS_BAD($GST_API_VERSION, [$GSTPD_REQ], [yes])
-GSTPD_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-bad-$GST_API_VERSION --variable pluginsdir`
-AC_SUBST(GSTPD_PLUGINS_DIR)
-AC_MSG_NOTICE(Using GStreamer Bad Plugins in $GSTPD_PLUGINS_DIR)
+
+dnl check for uninstalled plugin directories for unit tests
+AG_GST_CHECK_UNINSTALLED_SETUP([
+  AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [$GSTPB_REQ])
+  AG_GST_CHECK_GST_PLUGINS_BAD($GST_API_VERSION, [$GSTPB_REQ])
+])
 
 AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
 AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_GST_CHECK" = "xyes")