diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | ext/taglib/Makefile.am | 4 |
3 files changed, 18 insertions, 2 deletions
@@ -1,5 +1,13 @@ 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> + Patch by: Benoit Fouet <benoit.fouet purplelabs com> * sys/v4l2/gstv4l2src.c: (gst_v4l2src_negotiate): diff --git a/configure.ac b/configure.ac index ddb17be2..da521426 100644 --- a/configure.ac +++ b/configure.ac @@ -904,6 +904,14 @@ AG_GST_CHECK_FEATURE(TAGLIB, [taglib tagging library], taglib, [ if test "x$HAVE_CXX" != "xyes"; then USE_TAGLIB=false 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 ]) diff --git a/ext/taglib/Makefile.am b/ext/taglib/Makefile.am index b52916e7..ec01d4f9 100644 --- a/ext/taglib/Makefile.am +++ b/ext/taglib/Makefile.am @@ -7,8 +7,8 @@ libgsttaglib_la_CFLAGS = \ $(TAGLIB_CFLAGS) libgsttaglib_la_CXXFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_CXXFLAGS) -Wno-attributes \ - $(TAGLIB_CFLAGS) + $(GST_CXXFLAGS) \ + $(TAGLIB_CXXFLAGS) libgsttaglib_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ $(GST_LIBS) \ |