mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-06 02:32:23 +00:00
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
This commit is contained in:
parent
178ae4f99d
commit
8f1a67896b
1 changed files with 6 additions and 1 deletions
|
@ -1214,10 +1214,14 @@ AG_GST_CHECK_FEATURE(MPLEX, [mplex], mplex, [
|
||||||
dnl and mpeg2enc, we check for mplex on its own, too.
|
dnl and mpeg2enc, we check for mplex on its own, too.
|
||||||
dnl libmplex < 1.9rc? has fuzzy ABI, valgrind and other problems
|
dnl libmplex < 1.9rc? has fuzzy ABI, valgrind and other problems
|
||||||
PKG_CHECK_MODULES(MPLEX, mjpegtools >= 1.9.0, [
|
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
|
dnl switch over to c++ to test things
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_CPLUSPLUS
|
||||||
OLD_CPPFLAGS="$CPPFLAGS"
|
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, [
|
AC_CHECK_HEADER(interact.hpp, [
|
||||||
MPLEX_LIBS="$MPLEX_LIBS -lmplex2 $LIBM"
|
MPLEX_LIBS="$MPLEX_LIBS -lmplex2 $LIBM"
|
||||||
OLD_LIBS="$LIBS"
|
OLD_LIBS="$LIBS"
|
||||||
|
@ -1254,6 +1258,7 @@ main (int argc,
|
||||||
}
|
}
|
||||||
],[
|
],[
|
||||||
HAVE_MPLEX="yes"
|
HAVE_MPLEX="yes"
|
||||||
|
CPPFLAGS="$CPPFLAGS_GOOD"
|
||||||
AC_SUBST(MPLEX_CFLAGS)
|
AC_SUBST(MPLEX_CFLAGS)
|
||||||
AC_SUBST(MPLEX_LIBS)
|
AC_SUBST(MPLEX_LIBS)
|
||||||
AC_SUBST(MPLEX_LDFLAGS)
|
AC_SUBST(MPLEX_LDFLAGS)
|
||||||
|
|
Loading…
Reference in a new issue