From 71b8d4b5cefafbffdef9541b10f84625de58f94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Fri, 7 May 2010 16:42:12 +0400 Subject: [PATCH] mplex: add MPLEX_LDFLAGS variable So mingw32 users can hack around a compiler/linker bug. Fixes #617145 --- configure.ac | 4 ++++ ext/mplex/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ae8d34c602..448a91ae84 100644 --- a/configure.ac +++ b/configure.ac @@ -1088,6 +1088,8 @@ AG_GST_CHECK_FEATURE(MPLEX, [mplex], mplex, [ MPLEX_LIBS="$MPLEX_LIBS -lmplex2 -lm" OLD_LIBS="$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 don't want this here AC_MSG_CHECKING([for valid mplex objects]) @@ -1120,9 +1122,11 @@ main (int argc, HAVE_MPLEX="yes" AC_SUBST(MPLEX_CFLAGS) AC_SUBST(MPLEX_LIBS) + AC_SUBST(MPLEX_LDFLAGS) AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no)) LIBS="$OLD_LIBS" + LDFLAGS="$OLD_LDFLAGS" ]) CPPFLAGS="$OLD_CPPFLAGS" AC_LANG_C diff --git a/ext/mplex/Makefile.am b/ext/mplex/Makefile.am index d8976e70ae..86ff2f2158 100644 --- a/ext/mplex/Makefile.am +++ b/ext/mplex/Makefile.am @@ -10,7 +10,7 @@ libgstmplex_la_CXXFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS) libgstmplex_la_LIBADD = \ $(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 noinst_HEADERS = \