From 6d86239ade96de8788dbfdf05e942ed79ede77d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sat, 23 Feb 2008 12:35:53 +0000
Subject: [PATCH] Check for and define ERROR_CXXFLAGS and GST_CXXFLAGS and use
 them when building C++ code (#516509).

Original commit message from CVS:
* configure.ac:
* ext/sidplay/Makefile.am:
Check for and define ERROR_CXXFLAGS and GST_CXXFLAGS and use them
when building C++ code (#516509).
---
 ChangeLog               |  7 +++++++
 common                  |  2 +-
 configure.ac            | 10 +++++++++-
 ext/sidplay/Makefile.am |  4 ++--
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9607eb53a3..5a919e2b34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-23  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	* ext/sidplay/Makefile.am:
+          Check for and define ERROR_CXXFLAGS and GST_CXXFLAGS and use them
+          when building C++ code (#516509).
+
 2008-02-22  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/lame/gstlame.c: (gst_lame_sink_setcaps):
diff --git a/common b/common
index bd6ec57040..ce296a6e04 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit bd6ec57040fe3fa93e21ca440dfe494e3ee18555
+Subproject commit ce296a6e04ac824523dbf7bf836f91e14012ab9d
diff --git a/configure.ac b/configure.ac
index 58ad014637..1b5f22d137 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,6 +201,9 @@ AG_GST_SET_PLUGINDIR
 dnl define an ERROR_CFLAGS Makefile variable
 AG_GST_SET_ERROR_CFLAGS($GST_CVS)
 
+dnl define an ERROR_CXXFLAGS Makefile variable
+AG_GST_SET_ERROR_CXXFLAGS($GST_CVS)
+
 dnl define correct level for debugging messages
 AG_GST_SET_LEVEL_DEFAULT($GST_CVS)
 
@@ -385,16 +388,21 @@ else
 fi
 AC_SUBST(DEPRECATED_CFLAGS)
 
-dnl every flag in GST_OPTION_CFLAGS can be overridden at make time
+dnl every flag in GST_OPTION_CFLAGS and GST_OPTION_CXXFLAGS can be overridden
+dnl at make time with e.g. make ERROR_CFLAGS=""
 GST_OPTION_CFLAGS="\$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
+GST_OPTION_CXXFLAGS="\$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
 AC_SUBST(GST_OPTION_CFLAGS)
+AC_SUBST(GST_OPTION_CXXFLAGS)
 
 dnl FIXME: do we want to rename to GST_ALL_* ?
 dnl prefer internal headers to already installed ones
 dnl also add builddir include for enumtypes and marshal
 dnl add GST_OPTION_CFLAGS, but overridable
 GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CFLAGS)"
+GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CXXFLAGS)"
 AC_SUBST(GST_CFLAGS)
+AC_SUBST(GST_CXXFLAGS)
 AC_SUBST(GST_LIBS)
 
 dnl LDFLAGS really should only contain flags, not libs - they get added before
diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am
index 1644bf0394..28acf275e3 100644
--- a/ext/sidplay/Makefile.am
+++ b/ext/sidplay/Makefile.am
@@ -1,8 +1,8 @@
 plugin_LTLIBRARIES = libgstsid.la
 
 libgstsid_la_SOURCES = gstsiddec.cc
-libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(SIDPLAY_CFLAGS)
-libgstsid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(SIDPLAY_LIBS)
+libgstsid_la_CXXFLAGS = $(GST_CXXFLAGS) $(SIDPLAY_CFLAGS)
+libgstsid_la_LIBADD = $(GST_LIBS) $(SIDPLAY_LIBS)
 libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstsiddec.h