applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dump remnants of gstreamer-0.8 since it's not been supported for a while

Browse source 
2007-01-30  Jens Granseuer  <jensgr@gmx.net>
                                          
        * configure.in: dump remnants of gstreamer-0.8 since it's not been
        supported for a while

svn path=/trunk/; revision=7208
This commit is contained in:
Jens Granseuer 2007-01-30 20:52:01 +00:00 • committed by Jens Granseuer
parent 5332e54d66
commit 2006d45e5b
2 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-01-30 Jens Granseuer <jensgr@gmx.net>
* configure.in: dump remnants of gstreamer-0.8 since it's not been
supported for a while
2007-01-28 Christian Persch <chpe@svn.gnome.org> 2007-01-28 Christian Persch <chpe@svn.gnome.org>
* shell/Makefile.am: Respect the --disable-schemas-install configure * shell/Makefile.am: Respect the --disable-schemas-install configure

23
configure.in
View file

@ -497,16 +497,14 @@ dnl ==============================================
GST_MAJORMINOR=auto GST_MAJORMINOR=auto
AC_ARG_ENABLE(gstreamer, AC_ARG_ENABLE(gstreamer,
AC_HELP_STRING([--enable-gstreamer],[use gstreamer, if available (and optionally specify a version)]), AC_HELP_STRING([--enable-gstreamer],[use gstreamer if available (and optionally specify a version)]),
[case "${enableval}" in [case "${enableval}" in
yes) ENABLE_GSTREAMER=yes ;; yes) ENABLE_GSTREAMER=yes ;;
0.8) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.8 ;;
0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;; 0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
no) ENABLE_GSTREAMER=no ;; no) ENABLE_GSTREAMER=no ;;
*) AC_MSG_ERROR([ *) AC_MSG_ERROR([
*** Bad value ${enableval} for --enable-gstreamer *** Bad value ${enableval} for --enable-gstreamer
*** Please use one of the following: *** Please use one of the following:
*** --enable-gstreamer=0.8
*** --enable-gstreamer=0.10 *** --enable-gstreamer=0.10
]) ;; ]) ;;
esac], esac],
@ -514,33 +512,18 @@ esac],
if test "x$ENABLE_GSTREAMER" = "xyes"; then if test "x$ENABLE_GSTREAMER" = "xyes"; then
have_gstreamer=no have_gstreamer=no
if test x$GST_MAJORMINOR = xauto ; then
PKG_CHECK_MODULES(GST, gstreamer-0.8,[GST_MAJORMINOR=0.8],[GST_MAJORMINOR=0.10])
fi
if test x$GST_MAJORMINOR = x0.8 ; then
GST_REQS=0.8.0
PKGS="gstreamer-0.8 >= $GST_REQS gstreamer-interfaces-0.8 >= $GST_REQS"
else
GST_REQS=0.10.1.2 GST_REQS=0.10.1.2
PKGS="gstreamer-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GST_REQS" PKGS="gstreamer-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GST_REQS"
fi
PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes, PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes,
AC_MSG_RESULT([*** All of GStreamer dependent parts will be disabled ***])) AC_MSG_RESULT([*** All GStreamer-dependent parts will be disabled ***]))
if test x$GST_MAJORMINOR = x0.10 ; then
GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
fi
if test x$GST_MAJORMINOR = x0.8 ; then GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
GST_LIBS="$GST_LIBS -lgstinterfaces-0.8"
fi
else else
have_gstreamer=disabled have_gstreamer=disabled
AC_MSG_RESULT(*** GStreamer has been explicitly disabled ***) AC_MSG_RESULT(*** GStreamer has been explicitly disabled ***)
fi fi
AM_CONDITIONAL(HAVE_GSTREAMER, test x"$have_gstreamer" = "xyes") AM_CONDITIONAL(HAVE_GSTREAMER, test x"$have_gstreamer" = "xyes")
AM_CONDITIONAL(HAVE_GST10, test x"$GST_MAJORMINOR" = "x0.10")
AC_SUBST(GST_LIBS) AC_SUBST(GST_LIBS)
AC_SUBST(GST_CFLAGS) AC_SUBST(GST_CFLAGS)