diff options
| author | Hans de Goede <jwrdegoede@fedoraproject.org> | 2009-01-24 18:13:39 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-01-24 18:13:39 +0100 |
| commit | bf7ccbe0f8fd834ef186e5c266e40acaadf5536d (patch) | |
| tree | 155ce9c51f5cfc1cc3a43942094eb9bf3bdd6575 /configure.ac | |
| parent | 83ca36e07f7690b0703396f85974ba4ffd7a27e5 (diff) | |
| download | gst-plugins-bad-bf7ccbe0f8fd834ef186e5c266e40acaadf5536d.tar.gz gst-plugins-bad-bf7ccbe0f8fd834ef186e5c266e40acaadf5536d.tar.bz2 gst-plugins-bad-bf7ccbe0f8fd834ef186e5c266e40acaadf5536d.zip | |
Build the modplug plugin against the modplug library and remove our copy
Always build the modplug plugin against the system modplug library
and remove our own copy. Using the system version has advantages
if security issues or other critical bugs are found in libmodplug
and our own copy wasn't really maintained anyway.
Also our copy only contained some patches to use GLib types and functions.
Fixes bug #568837.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 33d780c1..87104e7d 100644 --- a/configure.ac +++ b/configure.ac @@ -251,7 +251,6 @@ AG_GST_CHECK_PLUGIN(flv) AG_GST_CHECK_PLUGIN(freeze) AG_GST_CHECK_PLUGIN(h264parse) AG_GST_CHECK_PLUGIN(librfb) -AG_GST_CHECK_PLUGIN(modplug) AG_GST_CHECK_PLUGIN(mpegdemux) AG_GST_CHECK_PLUGIN(mpegtsmux) AG_GST_CHECK_PLUGIN(mpeg4videoparse) @@ -278,12 +277,6 @@ AG_GST_CHECK_PLUGIN(y4m) dnl *** plug-ins to exclude *** -dnl see if we can build C++ plug-ins -if test "x$HAVE_CXX" != "xyes"; then - AC_MSG_WARN([Not compiling plug-ins requiring C++ compiler]) - AG_GST_DISABLE_PLUGIN(modplug) -fi - dnl real plugin only works on i386 and x86_64 for the time being. if test "x$HAVE_CPU_I386" != "xyes" && test "x$HAVE_CPU_X86_64" != "xyes"; then AC_MSG_WARN([Not building real plugin, only works on 32bit and 64bit x86 platforms]) @@ -827,6 +820,19 @@ AG_GST_CHECK_FEATURE(LIBMMS, [mms protocol library], libmms, [ ]) AC_SUBST(LIBMMS_LIBS) +dnl *** modplug *** +translit(dnm, m, l) AM_CONDITIONAL(USE_MODPLUG, true) +AG_GST_CHECK_FEATURE(MODPLUG, modplug, modplug, [ + if test "x$HAVE_CXX" != "xyes"; then + AC_MSG_WARN([Not compiling modplug plugin as it requires a C++ compiler]) + HAVE_MODPLUG="no" + else + PKG_CHECK_MODULES(MODPLUG, libmodplug, HAVE_MODPLUG="yes", HAVE_MODPLUG="no") + fi + AC_SUBST(MODPLUG_CFLAGS) + AC_SUBST(MODPLUG_LIBS) +]) + dnl *** mjpegtools version info *** dnl some may prefer older version (given quirks above) dnl hm, no version info seems available within mjpegtools headers @@ -1302,6 +1308,7 @@ AM_CONDITIONAL(USE_JACK, false) AM_CONDITIONAL(USE_JP2K, false) AM_CONDITIONAL(USE_LADSPA, false) AM_CONDITIONAL(USE_LIBMMS, false) +AM_CONDITIONAL(USE_MODPLUG, false) AM_CONDITIONAL(USE_METADATA, false) AM_CONDITIONAL(USE_MPEG2ENC, false) AM_CONDITIONAL(USE_MPLEX, false) @@ -1403,8 +1410,6 @@ gst/flv/Makefile gst/freeze/Makefile gst/h264parse/Makefile gst/librfb/Makefile -gst/modplug/Makefile -gst/modplug/libmodplug/Makefile gst/mpegdemux/Makefile gst/mpegtsmux/Makefile gst/mpegtsmux/tsmux/Makefile @@ -1473,6 +1478,7 @@ ext/ladspa/Makefile ext/libmms/Makefile ext/Makefile ext/nas/Makefile +ext/modplug/Makefile ext/mpeg2enc/Makefile ext/mplex/Makefile ext/musepack/Makefile |