diff options
| author | infirit <[email protected]> | 2014-11-23 15:17:33 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-23 15:17:33 +0100 |
| commit | 9bdf26a667fdb91c2aaa326b946e058677d97a0d (patch) | |
| tree | dd0bc647d5abe884810665e8ada535f094584af7 | |
| parent | 960af03507bc3e49d7aa45f0acc228cb25577d99 (diff) | |
| download | mate-panel-9bdf26a667fdb91c2aaa326b946e058677d97a0d.tar.bz2 mate-panel-9bdf26a667fdb91c2aaa326b946e058677d97a0d.tar.xz | |
Revert "gir: Require g-i 0.9.5 and stop using deprecated --strip-prefix option"
This reverts commit 24e90fe2904ea0783562e64ef6981fc83373604f.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libmate-panel-applet/Makefile.am | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 36a18ef6..56be8ca1 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,7 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) MATE_COMPILE_WARNINGS(maximum) # Check for introspection -GOBJECT_INTROSPECTION_CHECK([0.9.5]) +GOBJECT_INTROSPECTION_CHECK([0.6.7]) m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE='%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' diff --git a/libmate-panel-applet/Makefile.am b/libmate-panel-applet/Makefile.am index 44996055..a718e373 100644 --- a/libmate-panel-applet/Makefile.am +++ b/libmate-panel-applet/Makefile.am @@ -121,7 +121,9 @@ MatePanelApplet_4_0_gir_INCLUDES = GObject-2.0 Gtk-$(GTK_API_VERSION) Gio-2.0 MatePanelApplet_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(srcdir) MatePanelApplet_4_0_gir_LIBS = libmate-panel-applet-4.la MatePanelApplet_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix $(builddir)/,$(built_introspection_sources)) -MatePanelApplet_4_0_gir_SCANNERFLAGS = --identifier-prefix=MatePanel --symbol-prefix=mate-panel --pkg-export=libmatepanelapplet-4.0 +# When requiring gobject-introspection 0.9.5, use this: +#MatePanelApplet_4_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel --pkg-export=libmatepanelapplet-4.0 +MatePanelApplet_4_0_gir_SCANNERFLAGS = --strip-prefix=MatePanel --pkg-export=libmatepanelapplet-4.0 INTROSPECTION_GIRS += MatePanelApplet-4.0.gir girdir = $(INTROSPECTION_GIRDIR) |