diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2008-02-23 12:23:38 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2008-02-23 12:23:38 +0000 |
| commit | 954187812fe276dbf92ddb3af849961e936ab5dc (patch) | |
| tree | 3cda38e10c077f32c4bbfa191a3cd32bdcd8d1de /configure.ac | |
| parent | 67101abdd69f40043548a401b33a9f1d4127f95b (diff) | |
Check for and define ERROR_CXXFLAGS and use them when building
Original commit message from CVS:
* configure.ac:
* ext/taglib/Makefile.am:
Check for and define ERROR_CXXFLAGS and use them when building
C++ code (#516509).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 54f33963..a6c3170d 100644 --- a/configure.ac +++ b/configure.ac @@ -324,6 +324,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) @@ -981,9 +984,12 @@ 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 our libraries need to be versioned correctly AC_SUBST(GST_LT_LDFLAGS) @@ -993,7 +999,9 @@ dnl prefer internal headers to already installed ones dnl also add builddir include for enumtypes and marshal dnl add ERROR_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 |