DBus Menu

Merge lp:~ted/libdbusmenu/introspection-0.10-check into lp:~ken-vandine/libdbusmenu/natty-gtk3-fixes

  1. introspection-0.10-check
  2. Merge into natty-gtk3-fixes
Proposed by Ted Gould
Status: Merged
Merge reported by: Ted Gould
Merged at revision: not available
Proposed branch: lp:~ted/libdbusmenu/introspection-0.10-check
Merge into: lp:~ken-vandine/libdbusmenu/natty-gtk3-fixes
Diff against target: 63 lines (+21/-0)
3 files modified
configure.ac (+6/-0)
libdbusmenu-glib/Makefile.am (+7/-0)
libdbusmenu-gtk/Makefile.am (+8/-0)
To merge this branch: bzr merge lp:~ted/libdbusmenu/introspection-0.10-check
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+42852@code.launchpad.net

Description of the change

Checking for GIR < 0.10

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good, works on natty

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2010-11-11 17:23:00 +0000
3+++ configure.ac 2010-12-06 16:54:18 +0000
4@@ -116,6 +116,12 @@
5
6 GOBJECT_INTROSPECTION_CHECK([0.6.7])
7
8+PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.10],
9+ introspection_ten=yes,
10+ introspection_ten=no)
11+
12+AM_CONDITIONAL(INTROSPECTION_TEN, [test "x$introspection_ten" = "xyes"])
13+
14 ###########################
15 # Vala API Generation
16 ###########################
17
18=== modified file 'libdbusmenu-glib/Makefile.am'
19--- libdbusmenu-glib/Makefile.am 2010-11-23 21:06:30 +0000
20+++ libdbusmenu-glib/Makefile.am 2010-12-06 16:54:18 +0000
21@@ -114,11 +114,18 @@
22
23 -include $(INTROSPECTION_MAKEFILE)
24 INTROSPECTION_GIRS =
25+
26+if INTROSPECTION_TEN
27 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
28 --add-include-path=$(srcdir) \
29 $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
30 --symbol-prefix=dbusmenu \
31 --identifier-prefix=Dbusmenu
32+else
33+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
34+ --add-include-path=$(srcdir) \
35+ $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
36+endif
37
38 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
39
40
41=== modified file 'libdbusmenu-gtk/Makefile.am'
42--- libdbusmenu-gtk/Makefile.am 2010-11-23 21:06:30 +0000
43+++ libdbusmenu-gtk/Makefile.am 2010-12-06 16:54:18 +0000
44@@ -66,11 +66,19 @@
45
46 -include $(INTROSPECTION_MAKEFILE)
47 INTROSPECTION_GIRS =
48+
49+if INTROSPECTION_TEN
50 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
51 --add-include-path=$(top_builddir)/libdbusmenu-glib \
52 $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
53 --symbol-prefix=dbusmenu \
54 --identifier-prefix=DbusmenuGtk
55+else
56+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
57+ --add-include-path=$(top_builddir)/libdbusmenu-glib \
58+ $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
59+endif
60+
61 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
62
63 if HAVE_INTROSPECTION

Subscribers

People subscribed via source and target branches

to all changes: