summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2010-06-14 12:59:35 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2010-06-14 12:59:35 +0200
commitc804988a15bf68d5661a7af7799a51140d03c425 (patch)
tree45483fbd8bd590ed14e7aa5b5049d816e4dcd796
parent7a0fdf5423b537cf7e2d8fffcb5126a8d4b7d438 (diff)
gst-glib2.m4: Add our custom GLib CFLAGS to GLIB_EXTRA_CFLAGS
GLIB_CFLAGS is only used by core and all other modules get the flags from gstreamer-0.10.pc.
-rw-r--r--m4/gst-glib2.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/gst-glib2.m4 b/m4/gst-glib2.m4
index 1a94309..1305cda 100644
--- a/m4/gst-glib2.m4
+++ b/m4/gst-glib2.m4
@@ -25,11 +25,11 @@ AC_DEFUN([AG_GST_GLIB_CHECK],
dnl Add define to tell GLib that threading is always enabled within GStreamer
dnl code (optimisation, bypasses checks if the threading system is enabled
dnl when using threading primitives)
- GLIB_CFLAGS="$GLIB_CFLAGS -DG_THREADS_MANDATORY"
+ GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_THREADS_MANDATORY"
dnl Define G_DISABLE_DEPRECATED for GIT versions
if test "x$PACKAGE_VERSION_NANO" = "x1"; then
- GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_DEPRECATED"
+ GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_DISABLE_DEPRECATED"
fi
AC_ARG_ENABLE(gobject-cast-checks,
@@ -47,7 +47,7 @@ AC_DEFUN([AG_GST_GLIB_CHECK],
fi
if test "x$enable_gobject_cast_checks" = "xno"; then
- GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_CAST_CHECKS"
+ GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_DISABLE_CAST_CHECKS"
fi
dnl for the poor souls who for example have glib in /usr/local