mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 04:36:20 +00:00
Only use -Wno-attributes (which is there to work around a bug in the taglib 1.5 headers) if the c++ compiler actually...
Original commit message from CVS: * configure.ac:: * ext/taglib/Makefile.am:: Only use -Wno-attributes (which is there to work around a bug in the taglib 1.5 headers) if the c++ compiler actually supports it (#543255).
This commit is contained in:
parent
f2fb132b9c
commit
adf2c0a4a4
3 changed files with 18 additions and 2 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2008-07-17 Tim-Philipp Müller <tim.muller at collabora co uk>
|
||||||
|
|
||||||
|
* configure.ac::
|
||||||
|
* ext/taglib/Makefile.am::
|
||||||
|
Only use -Wno-attributes (which is there to work around a
|
||||||
|
bug in the taglib 1.5 headers) if the c++ compiler actually
|
||||||
|
supports it (#543255).
|
||||||
|
|
||||||
2008-07-17 Tim-Philipp Müller <tim.muller at collabora co uk>
|
2008-07-17 Tim-Philipp Müller <tim.muller at collabora co uk>
|
||||||
|
|
||||||
Patch by: Benoit Fouet <benoit.fouet purplelabs com>
|
Patch by: Benoit Fouet <benoit.fouet purplelabs com>
|
||||||
|
|
|
@ -904,6 +904,14 @@ AG_GST_CHECK_FEATURE(TAGLIB, [taglib tagging library], taglib, [
|
||||||
if test "x$HAVE_CXX" != "xyes"; then
|
if test "x$HAVE_CXX" != "xyes"; then
|
||||||
USE_TAGLIB=false
|
USE_TAGLIB=false
|
||||||
AC_MSG_NOTICE([Not building taglib plugin: no C++ compiler found])
|
AC_MSG_NOTICE([Not building taglib plugin: no C++ compiler found])
|
||||||
|
else
|
||||||
|
dnl work around bug in taglib 1.5 headers, remove once there is a 1.6
|
||||||
|
AS_CXX_COMPILER_FLAG([-Wno-attributes], [
|
||||||
|
TAGLIB_CXXFLAGS="$TAGLIB_CFLAGS -Wno-attributes"
|
||||||
|
], [
|
||||||
|
TAGLIB_CXXFLAGS="$TAGLIB_CFLAGS"
|
||||||
|
])
|
||||||
|
AC_SUBST(TAGLIB_CXXFLAGS)
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,8 @@ libgsttaglib_la_CFLAGS = \
|
||||||
$(TAGLIB_CFLAGS)
|
$(TAGLIB_CFLAGS)
|
||||||
libgsttaglib_la_CXXFLAGS = \
|
libgsttaglib_la_CXXFLAGS = \
|
||||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
$(GST_CXXFLAGS) -Wno-attributes \
|
$(GST_CXXFLAGS) \
|
||||||
$(TAGLIB_CFLAGS)
|
$(TAGLIB_CXXFLAGS)
|
||||||
libgsttaglib_la_LIBADD = \
|
libgsttaglib_la_LIBADD = \
|
||||||
$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
|
$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
|
||||||
$(GST_LIBS) \
|
$(GST_LIBS) \
|
||||||
|
|
Loading…
Reference in a new issue