From 8da902bb78cb5653f5e4b9b1371b34171f377d8f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 2 Nov 2011 15:31:11 -0400 Subject: [PATCH] configure: Allow setting GLIB_EXTRA_CFLAGS Similar to gstreamer commit bb2020b1e794210cf7d44c6626122f611016a620 --- common | 2 +- configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common b/common index 11f0cd5a3f..e4a9407a51 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 11f0cd5a3fba36f85cf3e434150bfe66b1bf08d4 +Subproject commit e4a9407a51803016bab9918b03e2034981886bdb diff --git a/configure.ac b/configure.ac index 3247887a01..8284534db9 100644 --- a/configure.ac +++ b/configure.ac @@ -902,8 +902,8 @@ AC_SUBST(GST_PLUGINS_BASE_CFLAGS) dnl FIXME: do we want to rename to GST_ALL_* ? dnl add GST_OPTION_CFLAGS, but overridable -GST_CXXFLAGS="$GLIB_CFLAGS $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS)" -GST_CFLAGS="$GLIB_CFLAGS $GST_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS)" +GST_CXXFLAGS="$GLIB_CFLAGS $GST_CFLAGS \$(GLIB_EXTRA_CFLAGS) \$(GST_OPTION_CXXFLAGS)" +GST_CFLAGS="$GLIB_CFLAGS $GST_CFLAGS \$(GLIB_EXTRA_CFLAGS) \$(GST_OPTION_CFLAGS)" AC_SUBST(GST_CFLAGS) AC_SUBST(GST_CXXFLAGS) dnl add GCOV libs because libtool strips -fprofile-arcs -ftest-coverage