[telepathy-qt4/master] Conditional build test-client only if python is found.

Andre Moreira Magalhaes (none) andrunko at andrunko-vmdebianlenny
Wed May 20 09:58:16 PDT 2009


test-client depends on account-manager.py that depends on python.
---
 tests/dbus/Makefile.am |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
index 4bd12f8..8412392 100644
--- a/tests/dbus/Makefile.am
+++ b/tests/dbus/Makefile.am
@@ -33,12 +33,25 @@ test_account_basics_SOURCES = account-basics.cpp
 endif
 
 if ENABLE_TP_GLIB_TESTS
+
+if HAVE_TEST_PYTHON
+# Tests which can only be run if we have suitable versions of Python and
+# dbus-python and telepathy-glib, and Qt was compiled to use the Glib main loop
+TESTS += \
+    test-client
+
+BUILT_SOURCES += \
+    _gen/client.cpp.moc.hpp
+
+test_client_SOURCES = client.cpp
+test_client_LDADD = $(LDADD) $(top_builddir)/tests/lib/libtp-glib-tests.la
+endif
+
 # Tests which can only be run if we have telepathy-glib, and Qt was compiled
 # to use the GLib main loop
 TESTS += \
     test-chan-basics \
     test-chan-group \
-    test-client \
     test-cm-basics \
     test-conn-basics \
     test-conn-requests \
@@ -52,7 +65,6 @@ TESTS += \
 BUILT_SOURCES += \
     _gen/chan-basics.cpp.moc.hpp \
     _gen/chan-group.cpp.moc.hpp \
-    _gen/client.cpp.moc.hpp \
     _gen/cm-basics.cpp.moc.hpp \
     _gen/conn-basics.cpp.moc.hpp \
     _gen/conn-requests.cpp.moc.hpp \
@@ -71,9 +83,6 @@ test_chan_basics_LDADD = $(LDADD) $(top_builddir)/tests/lib/echo2/libtp-glib-ech
 test_chan_group_SOURCES = chan-group.cpp
 test_chan_group_LDADD = $(LDADD) $(top_builddir)/tests/lib/csh/libtp-glib-csh-tests.la
 
-test_client_SOURCES = client.cpp
-test_client_LDADD = $(LDADD) $(top_builddir)/tests/lib/libtp-glib-tests.la
-
 test_cm_basics_SOURCES = cm-basics.cpp
 test_cm_basics_LDADD = $(LDADD) $(top_builddir)/tests/lib/libtp-glib-tests.la
 
-- 
1.5.6.5



More information about the telepathy-commits mailing list