diff options
| author | Dennis Schridde <devurandom@gmx.net> | 2011-09-19 23:43:26 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-19 23:43:26 -0500 |
| commit | 4177700e45a02a7f35b32dc24dd7ec6e150d6a0a (patch) | |
| tree | 08fe1f670ad1f93459773f61e3c0251a4d9116cc | |
| parent | 21afbd946557e93304bdb34199d62594f365799f (diff) | |
| download | libdbusmenu-4177700e45a02a7f35b32dc24dd7ec6e150d6a0a.tar.gz libdbusmenu-4177700e45a02a7f35b32dc24dd7ec6e150d6a0a.tar.bz2 libdbusmenu-4177700e45a02a7f35b32dc24dd7ec6e150d6a0a.zip | |
Adding an optional build of the dumper
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | tests/Makefile.am | 12 | ||||
| -rw-r--r-- | tools/Makefile.am | 6 |
3 files changed, 30 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index e284980..f347625 100644 --- a/configure.ac +++ b/configure.ac @@ -96,8 +96,17 @@ AC_SUBST(DBUSMENUGTK_LIBS) X11_REQUIRED_VERSION=1.3 +AC_ARG_ENABLE([dumper], + AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]), + [enable_dumper=$enableval], [enable_dumper=auto]) +AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"]) + +AS_IF([test "x$enable_dumper" != "xno"],[ PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION - x11 >= $X11_REQUIRED_VERSION) + x11 >= $X11_REQUIRED_VERSION, + [have_dumper=yes] +) +]) AC_SUBST(DBUSMENUDUMPER_CFLAGS) AC_SUBST(DBUSMENUDUMPER_LIBS) @@ -243,3 +252,8 @@ AM_COND_IF([HAVE_VALA], AC_MSG_NOTICE([ Vala bindings no]) ) +AS_IF([test "x$have_dumper" = "xyes"], + AC_MSG_NOTICE([ Dumper: yes]), + AC_MSG_NOTICE([ Dumper: no]) +) + diff --git a/tests/Makefile.am b/tests/Makefile.am index e6882af..a4e8682 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,8 +12,12 @@ TESTS = \ test-glib-properties \ test-glib-proxy \ test-glib-simple-items \ - test-glib-submenu \ + test-glib-submenu + +if WANT_DBUSMENUDUMPER +TESTS += \ test-json +endif if WANT_LIBDBUSMENUGTK TESTS += \ @@ -50,9 +54,13 @@ check_PROGRAMS = \ test-glib-proxy-proxy \ test-glib-submenu-client \ test-glib-submenu-server \ - test-glib-simple-items \ + test-glib-simple-items + +if WANT_DBUSMENUDUMPER +check_PROGRAMS += \ test-json-client \ test-json-server +endif if WANT_LIBDBUSMENUGTK check_PROGRAMS += \ 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 |