configure: fix up GST_CXXFLAGS properly

We don't want C specific flags in GST_CXXFLAGS, so base it on the
GST_CFLAGS that only contains the pkg-config CFLAGS but none of
the GST_OPTION_CFLAGS. Also, we only need the local includes once.
This commit is contained in:
Tim-Philipp Müller 2010-02-15 23:43:05 +00:00
parent 77b97d4a2d
commit cbbfba3152

View file

@ -1587,8 +1587,8 @@ dnl FIXME: do we want to rename to GST_ALL_* ?
dnl prefer internal headers to already installed ones dnl prefer internal headers to already installed ones
dnl also add builddir include for enumtypes and marshal dnl also add builddir include for enumtypes and marshal
dnl add GST_OPTION_CFLAGS, but overridable 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)" GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CXXFLAGS)"
GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CFLAGS)"
AC_SUBST(GST_CFLAGS) AC_SUBST(GST_CFLAGS)
AC_SUBST(GST_CXXFLAGS) AC_SUBST(GST_CXXFLAGS)
AC_SUBST(GST_LIBS) AC_SUBST(GST_LIBS)