[libpeas] Revert "Enable building with older gobject-introspection"
- From: Steve Frécinaux <sfre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas] Revert "Enable building with older gobject-introspection"
- Date: Mon, 16 Aug 2010 19:28:41 +0000 (UTC)
commit 9174732fed126e96b0833acccba5bc12bb51a184
Author: Steve Frécinaux <code istique net>
Date: Mon Aug 16 21:28:08 2010 +0200
Revert "Enable building with older gobject-introspection"
This reverts commit 73dcebbbf5693d4a72e1b22fe475d61bc8449185.
https://bugzilla.gnome.org/show_bug.cgi?id=626221
configure.ac | 13 ++-----------
libpeas/Makefile.am | 2 +-
libpeasui/Makefile.am | 2 +-
3 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c53eb03..121ee81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(PEAS, [
glib-2.0 >= 2.18.0
gobject-2.0 >= 2.23.6
gmodule-2.0 >= 2.18.0
- gobject-introspection-1.0 >= 0.6.9
+ gobject-introspection-1.0 >= 0.9.0
])
dnl ================================================================
@@ -134,16 +134,7 @@ dnl ================================================================
dnl GObject Introspection
dnl ================================================================
-GOBJECT_INTROSPECTION_REQUIRE([0.6.9])
-
-PKG_CHECK_EXISTS([gobject-introspection >= 0.9.0],
- [enable_gir_args=yes],
- [enable_gir_args=no])
-
-if test "$enable_gi_flags" = "yes"; then
- PEAS_GIR_SCANNER_ARGS="--warn-all"
- AC_SUBST(PEAS_GIR_SCANNER_ARGS)
-fi
+GOBJECT_INTROSPECTION_REQUIRE([0.9.0])
dnl ================================================================
dnl Seed Javascript Engine
diff --git a/libpeas/Makefile.am b/libpeas/Makefile.am
index f272fce..885d950 100644
--- a/libpeas/Makefile.am
+++ b/libpeas/Makefile.am
@@ -82,7 +82,7 @@ if HAVE_INTROSPECTION
INTROSPECTION_SCANNER_ARGS = \
-I$(top_srcdir) \
--c-include=libpeas/peas.h \
- $(PEAS_GIR_SCANNER_ARGS)
+ --warn-all
introspection_sources = $(INST_H_FILES) $(C_FILES)
diff --git a/libpeasui/Makefile.am b/libpeasui/Makefile.am
index 411c9cc..6dbc41e 100644
--- a/libpeasui/Makefile.am
+++ b/libpeasui/Makefile.am
@@ -46,7 +46,7 @@ if HAVE_INTROSPECTION
INTROSPECTION_SCANNER_ARGS = \
--add-include-path=$(top_builddir)/libpeas \
--c-include=libpeasui/peas-ui.h \
- $(PEAS_GIR_SCANNER_ARGS)
+ --warn-all
INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/libpeas
introspection_sources = $(INST_H_FILES) $(C_FILES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]