diff options
| author | Alan Conway <aconway@apache.org> | 2007-06-20 22:19:10 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-06-20 22:19:10 +0000 |
| commit | 02138c2d3e669ee0d1d07414518010810be2d8c1 (patch) | |
| tree | 798e764f7c897033ecadc2226c55aae1df084a46 /qpid/cpp/src | |
| parent | d9740561181713f422b22549c0fd45c586f76066 (diff) | |
| download | qpid-python-02138c2d3e669ee0d1d07414518010810be2d8c1.tar.gz | |
Dummy libcluster.so when openais is not available, keep rpmbuild happy.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@549277 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/Makefile.am | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/cluster.mk | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index 0468a2122b..5b09172ee2 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -105,9 +105,7 @@ endif lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la -if CLUSTER include cluster.mk -endif # The logger library uses boost::date_time to format time. # We have to disable the unused parameters warning to get around diff --git a/qpid/cpp/src/cluster.mk b/qpid/cpp/src/cluster.mk index 3658ee91b5..d5b0bed97f 100644 --- a/qpid/cpp/src/cluster.mk +++ b/qpid/cpp/src/cluster.mk @@ -1,11 +1,16 @@ #-*-Makefile-*- # Cluster library makefile fragment, to be included in Makefile.am # - lib_LTLIBRARIES += libqpidcluster.la +if CLUSTER + libqpidcluster_la_SOURCES = \ qpid/cluster/Cpg.cpp \ qpid/cluster/Cpg.h - libqpidcluster_la_LIBADD= -lcpg + +else +# Empty stub library to satisfy rpm spec file. +libqpidcluster_la_SOURCES = +endif |