summaryrefslogtreecommitdiff
path: root/cpp/src/tests/cluster.mk
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-11-18 19:55:59 +0000
committerAlan Conway <aconway@apache.org>2008-11-18 19:55:59 +0000
commit970fba7f2422eab256273a610135be33bd37f7d6 (patch)
tree2e1e66e3bd717c2adc02b9787bb55a0c20679381 /cpp/src/tests/cluster.mk
parentb355d0e5b46739c74e9cbef449d8fc50646e4db2 (diff)
downloadqpid-python-970fba7f2422eab256273a610135be33bd37f7d6.tar.gz
Optional cluster integration with cman quorum service.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@718693 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/cluster.mk')
-rw-r--r--cpp/src/tests/cluster.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/tests/cluster.mk b/cpp/src/tests/cluster.mk
index 88574943fd..95d8d0f034 100644
--- a/cpp/src/tests/cluster.mk
+++ b/cpp/src/tests/cluster.mk
@@ -1,10 +1,10 @@
-if CPG
+
+if HAVE_LIBCPG
+
#
# Cluster tests makefile fragment, to be included in Makefile.am
#
-lib_cluster = $(abs_builddir)/../cluster.la
-
# NOTE: Programs using the openais library must be run with gid=ais
# You should do "newgrp ais" before running the tests to run these.
#
@@ -16,8 +16,8 @@ EXTRA_DIST+=ais_check start_cluster stop_cluster
check_PROGRAMS+=cluster_test
cluster_test_SOURCES=unit_test.cpp cluster_test.cpp
-cluster_test_LDADD=$(lib_client) $(lib_cluster) -lboost_unit_test_framework
+cluster_test_LDADD=$(lib_client) ../cluster.la -lboost_unit_test_framework
-unit_test_LDADD+=$(lib_cluster)
+unit_test_LDADD+=../cluster.la
endif