Commit 8f1a6789 authored by Brad Smith's avatar Brad Smith Committed by Tim-Philipp Müller

configure: hack around broken mplex 2.0.0 headers in mplex check

Due to the addition of an unconditional inclusion of config.h in
mjpegtool 2.0.0's stream_params.h header the autoconf test for the
mplex module failed. Hack around this in the same way we did for
mpeg2enc.

https://bugzilla.gnome.org/show_bug.cgi?id=661614
parent 178ae4f9
......@@ -1214,10 +1214,14 @@ AG_GST_CHECK_FEATURE(MPLEX, [mplex], mplex, [
dnl and mpeg2enc, we check for mplex on its own, too.
dnl libmplex < 1.9rc? has fuzzy ABI, valgrind and other problems
PKG_CHECK_MODULES(MPLEX, mjpegtools >= 1.9.0, [
dnl HACK because mplex 2.0.0 header files have a spurious 'include config.h'
touch config.h
dnl switch over to c++ to test things
AC_LANG_CPLUSPLUS
OLD_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $MPLEX_CFLAGS"
dnl HACK as above
CPPFLAGS_GOOD="$CPPFLAGS $MPLEX_CFLAGS"
CPPFLAGS="$CPPFLAGS_GOOD -I."
AC_CHECK_HEADER(interact.hpp, [
MPLEX_LIBS="$MPLEX_LIBS -lmplex2 $LIBM"
OLD_LIBS="$LIBS"
......@@ -1254,6 +1258,7 @@ main (int argc,
}
],[
HAVE_MPLEX="yes"
CPPFLAGS="$CPPFLAGS_GOOD"
AC_SUBST(MPLEX_CFLAGS)
AC_SUBST(MPLEX_LIBS)
AC_SUBST(MPLEX_LDFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment