Attachment #279983 for bug #367285

Lines 3-11 EXTRA_DIST = \ Link Here

(-)a/Makefile.am (-1 / +5 lines)
3	COPYING-GPL3 \	3	COPYING-GPL3 \
4	m4/introspection.m4	4	m4/introspection.m4
5		5
		6	if WANT_LIBDBUSMENUGTK
		7	LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
		8	endif
		9
6	SUBDIRS = \	10	SUBDIRS = \
7	libdbusmenu-glib \	11	libdbusmenu-glib \
8	libdbusmenu-gtk \	12	$(LIBDBUSMENUGTK_SUBDIR) \
9	tools \	13	tools \
10	tests \	14	tests \
11	docs \	15	docs \




GTK_REQUIRED_VERSION=2.16
GTK3_REQUIRED_VERSION=2.91

AC_ARG_ENABLE([gtk],
	AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
	[enable_gtk=$enableval], [enable_gtk=auto])
AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])

AC_ARG_WITH([gtk],
  [AS_HELP_STRING([--with-gtk],
    [Which version of gtk to use @<:@default=2@:>@])],
  [],
  [with_gtk=3])
AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])

AS_IF([test "x$enable_gtk" != "xno"],[
AS_IF([test "x$with_gtk" = x3],
        [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                         glib-2.0 >= $GLIB_REQUIRED_VERSION,
                                         [have_gtk=yes]
)
         AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
        ],
      [test "x$with_gtk" = x2],
        [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                         glib-2.0 >= $GLIB_REQUIRED_VERSION,
                                         [have_gtk=yes]
)
        ],
      [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
)
])
AC_SUBST(DBUSMENUGTK_CFLAGS)
AC_SUBST(DBUSMENUGTK_LIBS)

###########################
# Dependencies - dumper

	GTK+ Version:           $with_gtk
])

AS_IF([test "x$enable_gtk" = "xyes"],
	AC_MSG_NOTICE([	Gtk:                    yes (gtk$with_gtk)]),
	AC_MSG_NOTICE([	Gtk:                    no])
)


Lines 13-25 TESTS = \ Link Here

(-)a/tests/Makefile.am (-5 / +13 lines)
13	test-glib-proxy \	13	test-glib-proxy \
14	test-glib-simple-items \	14	test-glib-simple-items \
15	test-glib-submenu \	15	test-glib-submenu \
16	test-json \	16	test-json
		17
		18	if WANT_LIBDBUSMENUGTK
		19	TESTS += \
17	test-gtk-objects-test \	20	test-gtk-objects-test \
18	test-gtk-label \	21	test-gtk-label \
19	test-gtk-shortcut \	22	test-gtk-shortcut \
20	test-gtk-reorder \	23	test-gtk-reorder \
21	test-gtk-submenu \	24	test-gtk-submenu \
22	test-gtk-parser-test	25	test-gtk-parser-test
		26	endif
23		27
24	XFAIL_TESTS = \	28	XFAIL_TESTS = \
25	test-glib-proxy	29	test-glib-proxy
Lines 44-63 check_PROGRAMS = \ Link Here
44	test-glib-proxy-client \	48	test-glib-proxy-client \
45	test-glib-proxy-server \	49	test-glib-proxy-server \
46	test-glib-proxy-proxy \	50	test-glib-proxy-proxy \
47	test-gtk-objects \
48	test-glib-submenu-client \	51	test-glib-submenu-client \
49	test-glib-submenu-server \	52	test-glib-submenu-server \
		53	test-glib-simple-items \
		54	test-json-client \
		55	test-json-server
		56
		57	if WANT_LIBDBUSMENUGTK
		58	check_PROGRAMS += \
		59	test-gtk-objects \
50	test-gtk-label-client \	60	test-gtk-label-client \
51	test-gtk-label-server \	61	test-gtk-label-server \
52	test-gtk-shortcut-client \	62	test-gtk-shortcut-client \
53	test-gtk-shortcut-server \	63	test-gtk-shortcut-server \
54	test-glib-simple-items \
55	test-gtk-reorder-server \	64	test-gtk-reorder-server \
56	test-json-client \
57	test-json-server \
58	test-gtk-submenu-server \	65	test-gtk-submenu-server \
59	test-gtk-submenu-client \	66	test-gtk-submenu-client \
60	test-gtk-parser	67	test-gtk-parser
		68	endif
61		69
62	XVFB_RUN=". $(srcdir)/run-xvfb.sh"	70	XVFB_RUN=". $(srcdir)/run-xvfb.sh"
63		71

Return to bug 367285

Lines 58-84 AC_SUBST(DBUSMENUGLIB_LIBS) Link Here

(-)a/configure.ac (-7 / +22 lines)
58	GTK_REQUIRED_VERSION=2.16	58	GTK_REQUIRED_VERSION=2.16
59	GTK3_REQUIRED_VERSION=2.91	59	GTK3_REQUIRED_VERSION=2.91
60		60
		61	AC_ARG_ENABLE([gtk],
		62	AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
		63	[enable_gtk=$enableval], [enable_gtk=auto])
		64	AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
		65
61	AC_ARG_WITH([gtk],	66	AC_ARG_WITH([gtk],
62	[AS_HELP_STRING([--with-gtk],	67	[AS_HELP_STRING([--with-gtk],
63	[Which version of gtk to use @<:@default=2@:>@])],	68	[Which version of gtk to use @<:@default=2@:>@])],
64	[],	69	[],
65	[with_gtk=3])	70	[with_gtk=3])
		71	AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
		72
		73	AS_IF([test "x$enable_gtk" != "xno"],[
66	AS_IF([test "x$with_gtk" = x3],	74	AS_IF([test "x$with_gtk" = x3],
67	[PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION	75	[PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
68	glib-2.0 >= $GLIB_REQUIRED_VERSION)	76	glib-2.0 >= $GLIB_REQUIRED_VERSION,
69	AC_SUBST(DBUSMENUGTK_CFLAGS)	77	[have_gtk=yes]
70	AC_SUBST(DBUSMENUGTK_LIBS)	78	)
71	AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])	79	AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
72	],	80	],
73	[test "x$with_gtk" = x2],	81	[test "x$with_gtk" = x2],
74	[PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION	82	[PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION
75	glib-2.0 >= $GLIB_REQUIRED_VERSION)	83	glib-2.0 >= $GLIB_REQUIRED_VERSION,
76	AC_SUBST(DBUSMENUGTK_CFLAGS)	84	[have_gtk=yes]
77	AC_SUBST(DBUSMENUGTK_LIBS)	85	)
78	],	86	],
79	[AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]	87	[AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
80	)	88	)
81	AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])	89	])
		90	AC_SUBST(DBUSMENUGTK_CFLAGS)
		91	AC_SUBST(DBUSMENUGTK_LIBS)
82		92
83	###########################	93	###########################
84	# Dependencies - dumper	94	# Dependencies - dumper
Lines 199-201 libdbusmenu Configuration: Link Here
199	GTK+ Version: $with_gtk	209	GTK+ Version: $with_gtk
200	])	210	])
201		211
		212	AS_IF([test "x$enable_gtk" = "xyes"],
		213	AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]),
		214	AC_MSG_NOTICE([ Gtk: no])
		215	)
		216