comparison configure.ac @ 22495:5c216e2c5405

Revert the dependency on gstreamer-0.10 >= 0.10.10, falling back to the SIGALRM hack on gstreamers which can't disable forking. This should keep both Alver and Stu happy in their respective stone-ages.
author Will Thompson <will.thompson@collabora.co.uk>
date Mon, 17 Mar 2008 13:38:34 +0000
parents 14c476bcdaee
children 4bcd3868a136 e4a4bc86c547
comparison
equal deleted inserted replaced
22494:14c476bcdaee 22495:5c216e2c5405
656 AM_GCONF_SOURCE_2 656 AM_GCONF_SOURCE_2
657 657
658 dnl ####################################################################### 658 dnl #######################################################################
659 dnl # Check for GStreamer 659 dnl # Check for GStreamer
660 dnl ####################################################################### 660 dnl #######################################################################
661 dnl
662 dnl TODO: Depend on gstreamer >= 0.10.10, and remove the conditional use of
663 dnl gst_registry_fork_set_enabled.
661 AC_ARG_ENABLE(gstreamer, 664 AC_ARG_ENABLE(gstreamer,
662 [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], 665 [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])],
663 enable_gst="$enableval", enable_gst="yes") 666 enable_gst="$enableval", enable_gst="yes")
664 if test "x$enable_gst" != "xno"; then 667 if test "x$enable_gst" != "xno"; then
665 PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10 >= 0.10.10], [ 668 PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], [
666 AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) 669 AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds])
667 AC_SUBST(GSTREAMER_CFLAGS) 670 AC_SUBST(GSTREAMER_CFLAGS)
668 AC_SUBST(GSTREAMER_LIBS) 671 AC_SUBST(GSTREAMER_LIBS)
672 AC_CHECK_LIB(gstreamer-0.10, gst_registry_fork_set_enabled,
673 [ AC_DEFINE(GST_CAN_DISABLE_FORKING, [],
674 [Define if gst_registry_fork_set_enabled exists])],
675 [], [$GSTREAMER_LIBS])
669 ], [ 676 ], [
670 AC_MSG_RESULT(no) 677 AC_MSG_RESULT(no)
671 enable_gst="no" 678 enable_gst="no"
672 ]) 679 ])
673 fi 680 fi