diff options
| author | Colin Walters <walters@verbum.org> | 2010-09-07 13:49:15 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-09-07 13:49:15 -0400 |
| commit | 900371e187a6b93e0b67cd03571adedc5e6057b5 (patch) | |
| tree | 753cad538e77a4fe34f65eb2f5eda9b58395f60a | |
| parent | a8a0882be967016c2e5f3be2fad9637a49e7f2d7 (diff) | |
| download | gconf-900371e187a6b93e0b67cd03571adedc5e6057b5.tar.gz | |
introspection: Update to new g-i
Add --warn-all. Also we need explicit --identifier-prefix and
--symbol-prefix right now, because the scanner defaults the symbol
prefix to g_conf.
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | gconf/Makefile.am | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.in b/configure.in index b047ad43..0e2e1859 100644 --- a/configure.in +++ b/configure.in @@ -303,7 +303,7 @@ AM_GLIB_GNU_GETTEXT AC_CHECK_FUNCS(bind_textdomain_codeset) -GOBJECT_INTROSPECTION_CHECK([0.6.7]) +GOBJECT_INTROSPECTION_CHECK([0.9.5]) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 1dcfbe15..616fa284 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -124,7 +124,7 @@ libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) +INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) INTROSPECTION_COMPILER_ARGS= --includedir=$(srcdir) if HAVE_INTROSPECTION @@ -137,6 +137,7 @@ GConf_2_0_gir_CFLAGS = \ $(INCLUDES) GConf_2_0_gir_LIBS = libgconf-2.la GConf_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) +GConf_2_0_gir_SCANNERFLAGS = --identifier-prefix=GConf --symbol-prefix=gconf INTROSPECTION_GIRS += GConf-2.0.gir girdir = $(datadir)/gir-1.0/ |