Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove -mt from gstreamer CFLAGS/LIBS under Solaris/gcc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-27 23:02:22 +00:00
parent 67868c1e6c
commit 122ff921f0
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
configure.in
View File

@@ -6919,7 +6919,7 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
dnl GStreamer dnl GStreamer
dnl ----------------------------------------------------------------------- dnl -----------------------------------------------------------------------
if test "$wxUSE_GTK" = 1; then if test "$wxUSE_GTK" = 1; then
wxUSE_GSTREAMER="yes" wxUSE_GSTREAMER="no"
dnl ------------------------------------------------------------------- dnl -------------------------------------------------------------------
dnl Test for at least 0.8 gstreamer module from pkg-config dnl Test for at least 0.8 gstreamer module from pkg-config
@@ -6939,8 +6939,8 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
gstreamer-plugins-base-$GST_MAJORMINOR gstreamer-plugins-base-$GST_MAJORMINOR
gconf-2.0, gconf-2.0,
[ [
CPPFLAGS="$GST_CFLAGS $CPPFLAGS" wxUSE_GSTREAMER="yes"
LIBS="$LIBS $GST_LIBS -lgstinterfaces-$GST_MAJORMINOR" GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_MAJORMINOR"
], ],
[ [
GST_VERSION_MINOR=8 GST_VERSION_MINOR=8
@@ -6957,17 +6957,28 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
gstreamer-interfaces-$GST_MAJORMINOR gstreamer-interfaces-$GST_MAJORMINOR
gstreamer-gconf-$GST_MAJORMINOR, gstreamer-gconf-$GST_MAJORMINOR,
[ [
CPPFLAGS="$GST_CFLAGS $CPPFLAGS" wxUSE_GSTREAMER="yes"
LIBS="$LIBS $GST_LIBS"
], ],
[ [
AC_MSG_WARN([Proper GStreamer .8/.10 installation not found]) AC_MSG_WARN([Proper GStreamer .8/.10 installation not found])
wxUSE_GSTREAMER="no"
]) ])
fi fi
if test "$wxUSE_GSTREAMER" = "yes"; then if test "$wxUSE_GSTREAMER" = "yes"; then
dnl system gstreamer package is compiled with Sun CC and outputs
dnl CC-specific "-mt" in its flags, remove it for gcc compilation
case "${host}" in
*-*-solaris2* )
if "$GCC" = yes; then
GST_CFLAGS=`echo $GST_CFLAGS | sed 's/-mt//'`
GST_LIBS=`echo $GST_LIBS | sed 's/-mt//'`
fi
esac
CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
LIBS="$GST_LIBS $LIBS"
AC_DEFINE(wxUSE_GSTREAMER) AC_DEFINE(wxUSE_GSTREAMER)
AC_MSG_RESULT([GStreamer detection successful]) AC_MSG_RESULT([GStreamer detection successful])
fi fi