Author: aconway
Date: Wed Jun 20 15:19:10 2007
New Revision: 549277
URL: http://svn.apache.org/viewvc?view=rev&rev=549277
Log:
Dummy libcluster.so when openais is not available, keep rpmbuild happy.
Modified:
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/cluster.mk
incubator/qpid/trunk/qpid/cpp/src/tests/ (props changed)
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?view=diff&rev=549277&r1=549276&r2=549277
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Wed Jun 20 15:19:10 2007
@@ -105,9 +105,7 @@
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
Modified: incubator/qpid/trunk/qpid/cpp/src/cluster.mk
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/cluster.mk?view=diff&rev=549277&r1=549276&r2=549277
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/cluster.mk (original)
+++ incubator/qpid/trunk/qpid/cpp/src/cluster.mk Wed Jun 20 15:19:10 2007
@@ -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
Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun 20 15:19:10 2007
@@ -15,3 +15,4 @@
.valgrind.supp
interop_runner
Cpg
+Url
