From 56402508c922604b40b1b164d1b4c6f2663d7627 Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Fri, 5 Apr 2013 00:38:14 +0200 Subject: [PATCH] build: make --internal of glib-genmarshal optional glib-genmarshal --internal has been introduced in glib 2.13.0. Check the GLib version and eventually strip this flag from the makefiles. --- configure.ac | 7 +++++++ src/adg/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c612449c..1e4e56c5 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,13 @@ AC_CONFIG_COMMANDS([default], # Check for required packages PKG_CHECK_MODULES([GLIB],[glib-2.0]) + +AC_MSG_CHECKING([if glib-genmarshal supports --internal]) +AS_IF([$PKG_CONFIG --atleast-version 2.13.0 glib-2.0], + [AC_MSG_RESULT([yes]) + GLIB_GENMARSHAL="$GLIB_GENMARSHAL --internal"], + [AC_MSG_RESULT([no])]) + PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= ]gobject_prereq) PKG_CHECK_MODULES([CAIRO],[cairo >= ]cairo_prereq) PKG_CHECK_MODULES([CAIRO_GOBJECT],[cairo-gobject], diff --git a/src/adg/Makefile.am b/src/adg/Makefile.am index a3b67fcf..583ef17e 100644 --- a/src/adg/Makefile.am +++ b/src/adg/Makefile.am @@ -252,7 +252,7 @@ endif mkenums_command= $(AM_V_GEN)$(GLIB_MKENUMS) \ --template genmarshal_command= $(AM_V_GEN)$(GLIB_GENMARSHAL) \ - --nostdinc --internal --prefix=adg_marshal + --nostdinc --prefix=adg_marshal adg-type-builtins.c: $(srcdir)/adg-type-builtins.c.mkenums $(srcdir)/adg-enums.h -- 2.11.4.GIT