tests: remove extra unref in test_setup_non_existing_stream

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

diff --git a/configure.ac b/configure.ac
index c742de0..d538367 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.62)
 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(Gst-RTSP, 0.11.89.1,
+AC_INIT(Gst-RTSP, 0.11.90.1,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-rtsp)
 AG_GST_INIT
@@ -20,7 +20,7 @@ dnl can autoconf find the source ?
 AC_CONFIG_SRCDIR([gst/rtsp-server/rtsp-server.c])
 
 dnl define the output header for config
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
 AM_MAINTAINER_MODE([enable])
@@ -42,8 +42,9 @@ AC_SUBST(GST_API_VERSION)
 AS_LIBTOOL(GST, 0, 0, 0)
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.11.0
-GSTPB_REQ=0.11.0
+GST_REQ=1.0.0
+GSTPB_REQ=1.1.0.1
+GSTPG_REQ=1.0.0
 
 dnl *** autotools stuff ****
 
@@ -90,18 +91,6 @@ dnl check for documentation tools
 AG_GST_DOCBOOK_CHECK
 GTK_DOC_CHECK([1.3])
 
-dnl Check for Vala
-AC_ARG_ENABLE([vala],
-  AC_HELP_STRING([--enable-vala],[enable Vala bindings (default=yes)]),
-  [case "${enableval}" in
-    yes) enable_vala=yes ;;
-    no)  enable_vala=no ;;
-    *) AC_MSG_ERROR(bad value ${enableval} for --enable-vala) ;;
-   esac
-  ],
-  [enable_vala=yes]) dnl Default value
-AM_CONDITIONAL(WITH_VALA, [test "x$enable_vala" = "xyes"])
-
 dnl *** checks for libraries ***
 
 dnl *** checks for header files ***
@@ -116,8 +105,8 @@ dnl *** checks for library functions ***
 
 dnl *** checks for dependancy libraries ***
 
-dnl GLib is required (GStreamer is ok with GLib-2.8, but we want at least 2.10)
-GLIB_REQ=2.10.0
+dnl GLib is required
+GLIB_REQ=2.32.0
 AC_SUBST([GLIB_REQ])
 AG_GST_GLIB_CHECK([$GLIB_REQ])
 
@@ -142,6 +131,11 @@ GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_API_VERSION --variabl
 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_CHECK($GST_API_VERSION, [$GST_REQ], no)
 
 dnl FIXME: get rid of this by making sure gstreamer-check brings it in
@@ -159,8 +153,13 @@ AC_SUBST(GST_LICENSE)
 dnl set location of plugin directory
 AG_GST_SET_PLUGINDIR
 
+# set by AG_GST_PARSE_SUBSYSTEM_DISABLES above
+dnl make sure it doesn't complain about unused variables if debugging is disabled
+NO_WARNINGS=""
+AG_GST_CHECK_GST_DEBUG_DISABLED([NO_WARNINGS="-Wno-unused"], [NO_WARNINGS=""])
+
 dnl define an ERROR_CFLAGS Makefile variable
-AG_GST_SET_ERROR_CFLAGS($GST_GIT)
+AG_GST_SET_ERROR_CFLAGS($GST_GIT, [$NO_WARNINGS])
 
 dnl define correct level for debugging messages
 AG_GST_SET_LEVEL_DEFAULT($GST_GIT)
@@ -188,13 +187,13 @@ DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED"
 AC_SUBST(DEPRECATED_CFLAGS)
 
 dnl every flag in GST_OPTION_CFLAGS can be overridden at make time
-GST_OPTION_CFLAGS="\$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
+GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
 AC_SUBST(GST_OPTION_CFLAGS)
 
 dnl FIXME: do we want to rename to GST_ALL_* ?
 dnl prefer internal headers to already installed ones
 dnl add GST_OPTION_CFLAGS, but overridable
-GST_CFLAGS="$GST_CFLAGS -DGST_USE_UNSTABLE_API \$(GST_OPTION_CFLAGS)"
+GST_CFLAGS="$GST_CFLAGS \$(GST_OPTION_CFLAGS)"
 AC_SUBST(GST_CFLAGS)
 AC_SUBST(GST_LIBS)
 
@@ -245,8 +244,7 @@ gst/Makefile
 gst/rtsp-server/Makefile
 examples/Makefile
 tests/Makefile
-bindings/Makefile
-bindings/vala/Makefile
+tests/check/Makefile
 pkgconfig/Makefile
 pkgconfig/gstreamer-rtsp-server.pc
 pkgconfig/gstreamer-rtsp-server-uninstalled.pc
@@ -263,7 +261,6 @@ Configuration
        Source code location       : ${srcdir}
        Prefix                     : ${prefix}
        Compiler                   : ${CC}
-       Vala bindings              : ${enable_vala}
 
 gst-rtsp-server configured. Type 'make' to build.
 "