Import upstream version 0.4.94

4 files changed, 32 insertions, 19 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 48993f1..029b73e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,11 @@
 
 SUBDIRS = testapp
 
-libexec_PROGRAMS = dbusmenu-dumper
+libexec_PROGRAMS =
+
+if WANT_DBUSMENUDUMPER
+libexec_PROGRAMS += dbusmenu-dumper
+endif
 
 libexec_SCRIPTS = dbusmenu-bench
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 233231e..6675979 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -36,17 +36,24 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-libexec_PROGRAMS = dbusmenu-dumper$(EXEEXT)
+libexec_PROGRAMS = $(am__EXEEXT_1)
+@WANT_DBUSMENUDUMPER_TRUE@am__append_1 = dbusmenu-dumper
 subdir = tools
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@WANT_DBUSMENUDUMPER_TRUE@am__EXEEXT_1 = dbusmenu-dumper$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(docdir)"
 PROGRAMS = $(libexec_PROGRAMS)
@@ -201,6 +208,8 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HELP_DIR = @HELP_DIR@
diff --git a/tools/testapp/Makefile.am b/tools/testapp/Makefile.am
index 39de532..e2bbde7 100644
--- a/tools/testapp/Makefile.am
+++ b/tools/testapp/Makefile.am
@@ -1,11 +1,9 @@
 
-if USE_GTK3
-VER=3
-else
-VER=
-endif
+libexec_PROGRAMS =
 
-libexec_PROGRAMS = dbusmenu-testapp
+if WANT_TESTS
+libexec_PROGRAMS += dbusmenu-testapp
+endif
 
 dbusmenu_testapp_SOURCES = \
 	main.c
@@ -18,6 +16,4 @@ dbusmenu_testapp_CFLAGS = \
 
 dbusmenu_testapp_LDADD = \
 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
-	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
-	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in
index becf2a1..cbe3a86 100644
--- a/tools/testapp/Makefile.in
+++ b/tools/testapp/Makefile.in
@@ -34,17 +34,24 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-libexec_PROGRAMS = dbusmenu-testapp$(EXEEXT)
+libexec_PROGRAMS = $(am__EXEEXT_1)
+@WANT_TESTS_TRUE@am__append_1 = dbusmenu-testapp
 subdir = tools/testapp
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@WANT_TESTS_TRUE@am__EXEEXT_1 = dbusmenu-testapp$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(libexecdir)"
 PROGRAMS = $(libexec_PROGRAMS)
 am_dbusmenu_testapp_OBJECTS = dbusmenu_testapp-main.$(OBJEXT)
@@ -52,8 +59,7 @@ dbusmenu_testapp_OBJECTS = $(am_dbusmenu_testapp_OBJECTS)
 am__DEPENDENCIES_1 =
 dbusmenu_testapp_DEPENDENCIES =  \
 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
-	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
@@ -137,6 +143,8 @@ GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HELP_DIR = @HELP_DIR@
@@ -263,8 +271,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@USE_GTK3_FALSE@VER = 
-@USE_GTK3_TRUE@VER = 3
 dbusmenu_testapp_SOURCES = \
 	main.c
 
@@ -276,8 +282,6 @@ dbusmenu_testapp_CFLAGS = \
 
 dbusmenu_testapp_LDADD = \
 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
-	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
-	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
 all: all-am