mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-03-04 14:00:28 +01:00
commit 739b439f02
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 1de7f6ab2d4bc1af69f06079cf0f4e2cbbfdc178 Subproject commit 6aec6b9716c184c60c4bc6a5916a2471cfa8c8cd

7
configure.ac
View file

@ -41,6 +41,8 @@ dnl we override it here if we need to for the release candidate of new series
GST_MAJORMINOR=0.11 GST_MAJORMINOR=0.11
AC_SUBST(GST_MAJORMINOR) AC_SUBST(GST_MAJORMINOR)
AG_GST_LIBTOOL_PREPARE
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
@ -77,9 +79,6 @@ dnl find a compiler
AC_PROG_CC AC_PROG_CC
AC_PROG_CC_STDC AC_PROG_CC_STDC
# FIXME: is this line needed?
AS="${CC}"
dnl check if the compiler supports '-c' and '-o' options dnl check if the compiler supports '-c' and '-o' options
AM_PROG_CC_C_O AM_PROG_CC_C_O
@ -183,7 +182,7 @@ AC_SUBST(GST_ALL_LDFLAGS)
dnl this really should only contain flags, not libs - they get added before dnl this really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS" GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc.*' $GST_ALL_LDFLAGS"
AC_SUBST(GST_PLUGIN_LDFLAGS) AC_SUBST(GST_PLUGIN_LDFLAGS)
dnl Add MacOSX specific flags dnl Add MacOSX specific flags