diff options
| author | Ted Gould <ted@canonical.com> | 2009-06-17 13:48:50 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-06-17 13:48:50 -0500 |
| commit | 23b418faf95a4e8fef6c98726309292325b5919c (patch) | |
| tree | 27e40bd39f677e48492a1a9694399fb51877d195 | |
| parent | 757ec5c8852ca964f25326e96c66c0e44c8614b8 (diff) | |
| download | libdbusmenu-23b418faf95a4e8fef6c98726309292325b5919c.tar.gz libdbusmenu-23b418faf95a4e8fef6c98726309292325b5919c.tar.bz2 libdbusmenu-23b418faf95a4e8fef6c98726309292325b5919c.zip | |
Adding in json-glib to make the tests more configurable.
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | tests/Makefile.am | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9770814..d35e27b 100644 --- a/configure.ac +++ b/configure.ac @@ -49,6 +49,17 @@ AC_SUBST(DBUSMENUGTK_CFLAGS) AC_SUBST(DBUSMENUGTK_LIBS) ########################### +# Dependencies - Testing +########################### + +JSON_GLIB_REQUIRED_VERSION=0.6.0 + +PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION) + +AC_SUBST(DBUSMENUTESTS_CFLAGS) +AC_SUBST(DBUSMENUTESTS_LIBS) + +########################### # Lib versioning ########################### diff --git a/tests/Makefile.am b/tests/Makefile.am index 70750ac..3e818a2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -94,12 +94,14 @@ test_gtk_label_server_SOURCES = \ test_gtk_label_server_CFLAGS = \ -I $(srcdir)/.. \ $(DBUSMENUGTK_CFLAGS) \ + $(DBUSMENUTESTS_CFLAGS) \ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror test_gtk_label_server_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ ../libdbusmenu-gtk/libdbusmenu-gtk.la \ - $(DBUSMENUGTK_LIBS) + $(DBUSMENUGTK_LIBS) \ + $(DBUSMENUTESTS_LIBS) test_gtk_label_client_SOURCES = \ test-gtk-label.h \ @@ -108,12 +110,14 @@ test_gtk_label_client_SOURCES = \ test_gtk_label_client_CFLAGS = \ -I $(srcdir)/.. \ $(DBUSMENUGTK_CFLAGS) \ + $(DBUSMENUTESTS_CFLAGS) \ $(DBUSMENUGLIB_CFLAGS) -Wall -Werror test_gtk_label_client_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ ../libdbusmenu-gtk/libdbusmenu-gtk.la \ - $(DBUSMENUGTK_LIBS) + $(DBUSMENUGTK_LIBS) \ + $(DBUSMENUTESTS_LIBS) |