mount-points: sort sequence before g_sequence_lookup

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

diff --git a/configure.ac b/configure.ac
index c61282f..4fe59ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,13 +2,13 @@ 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,
-    http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
-    gst-rtsp)
+AC_INIT([GStreamer RTSP Server Library], [0.11.90.1],
+    [http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],
+    [gst-rtsp-server])
 AG_GST_INIT
 
 dnl initialize automake
-AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar])
+AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
 
 dnl define PACKAGE_VERSION_* variables
 AS_VERSION
@@ -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,9 +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
-GSTPG_REQ=0.11.0
+GST_REQ=1.2.0
+GSTPB_REQ=1.2.0
+GSTPG_REQ=1.2.0
 
 dnl *** autotools stuff ****
 
@@ -57,9 +57,9 @@ AC_CONFIG_MACRO_DIR([m4])
 
 dnl set up gettext
 dnl the version check needs to stay here because autopoint greps for it
-AM_GNU_GETTEXT_VERSION([0.17])
-AM_GNU_GETTEXT([external])
-AG_GST_GETTEXT([gstreamer-$GST_API_VERSION])
+#AM_GNU_GETTEXT_VERSION([0.17])
+#AM_GNU_GETTEXT([external])
+#AG_GST_GETTEXT([gst-rtsp-server-$GST_API_VERSION])
 
 dnl *** check for arguments to configure ***
 
@@ -91,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 ***
@@ -117,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])
 
@@ -205,7 +193,7 @@ 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)
 
@@ -241,6 +229,11 @@ AC_SUBST([GST_OBJ_CFLAGS])
 GST_OBJ_LIBS="\$(top_builddir)/gst/rtsp-server/libgstrtspserver-$GST_API_VERSION.la \$(GST_ALL_LIBS)"
 AC_SUBST([GST_OBJ_LIBS])
 
+PKG_CHECK_MODULES(LIBCGROUP, libcgroup >= 0.26, HAVE_LIBCGROUP="yes", HAVE_LIBCGROUP="no")
+AC_SUBST(LIBCGROUP_CFLAGS)
+AC_SUBST(LIBCGROUP_LIBS)
+AM_CONDITIONAL(HAVE_LIBCGROUP, test "x$HAVE_LIBCGROUP" = "xyes")
+
 dnl this really should only contain flags, not libs - they get added before
 dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
 
@@ -257,8 +250,6 @@ gst/rtsp-server/Makefile
 examples/Makefile
 tests/Makefile
 tests/check/Makefile
-bindings/Makefile
-bindings/vala/Makefile
 pkgconfig/Makefile
 pkgconfig/gstreamer-rtsp-server.pc
 pkgconfig/gstreamer-rtsp-server-uninstalled.pc
@@ -275,7 +266,7 @@ Configuration
        Source code location       : ${srcdir}
        Prefix                     : ${prefix}
        Compiler                   : ${CC}
-       Vala bindings              : ${enable_vala}
+       CGroups example            : ${HAVE_LIBCGROUP}
 
 gst-rtsp-server configured. Type 'make' to build.
 "