mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

mplex: add MPLEX_LDFLAGS variable

Browse source 
So mingw32 users can hack around a compiler/linker bug.

Fixes #617145
This commit is contained in:
Руслан Ижбулатов 2010-05-07 16:42:12 +04:00 committed by Tim-Philipp Müller
parent 721643431e
commit 71b8d4b5ce
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -1088,6 +1088,8 @@ AG_GST_CHECK_FEATURE(MPLEX, [mplex], mplex, [
MPLEX_LIBS="$MPLEX_LIBS -lmplex2 -lm" MPLEX_LIBS="$MPLEX_LIBS -lmplex2 -lm"
OLD_LIBS="$LIBS" OLD_LIBS="$LIBS"
LIBS="$LIBS $MPLEX_LIBS" LIBS="$LIBS $MPLEX_LIBS"
OLD_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $MPLEX_LDFLAGS"
dnl older libmplex uses off_t SegmentSize (), which leads to fuzzy ABI; dnl older libmplex uses off_t SegmentSize (), which leads to fuzzy ABI;
dnl don't want this here dnl don't want this here
AC_MSG_CHECKING([for valid mplex objects]) AC_MSG_CHECKING([for valid mplex objects])
@ -1120,9 +1122,11 @@ main (int argc,
HAVE_MPLEX="yes" HAVE_MPLEX="yes"
AC_SUBST(MPLEX_CFLAGS) AC_SUBST(MPLEX_CFLAGS)
AC_SUBST(MPLEX_LIBS) AC_SUBST(MPLEX_LIBS)
AC_SUBST(MPLEX_LDFLAGS)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
], AC_MSG_RESULT(no)) ], AC_MSG_RESULT(no))
LIBS="$OLD_LIBS" LIBS="$OLD_LIBS"
LDFLAGS="$OLD_LDFLAGS"
]) ])
CPPFLAGS="$OLD_CPPFLAGS" CPPFLAGS="$OLD_CPPFLAGS"
AC_LANG_C AC_LANG_C

2
ext/mplex/Makefile.am
View file

@ -10,7 +10,7 @@ libgstmplex_la_CXXFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS)
libgstmplex_la_LIBADD = \ libgstmplex_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(MPLEX_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(MPLEX_LIBS)
libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(MPLEX_LDFLAGS)
libgstmplex_la_LIBTOOLFLAGS = --tag=disable-static libgstmplex_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = \ noinst_HEADERS = \