Author: aconway
Date: Wed Aug 1 14:14:26 2007
New Revision: 561952
URL: http://svn.apache.org/viewvc?view=rev&rev=561952
Log:
Propagate --disable-cluster to spec file
Modified:
incubator/qpid/trunk/qpid/cpp/configure.ac
incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
Modified: incubator/qpid/trunk/qpid/cpp/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/configure.ac?view=diff&rev=561952&r1=561951&r2=561952
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/configure.ac (original)
+++ incubator/qpid/trunk/qpid/cpp/configure.ac Wed Aug 1 14:14:26 2007
@@ -153,12 +153,14 @@
AM_CONDITIONAL([CLUSTER], [test x$enable_CLUSTER = xyes])
if test x$enable_CLUSTER = xyes; then
CPPFLAGS+=" -DCLUSTER"
- REQUIRES_OPENAIS="Requires: openais"
- AC_SUBST(REQUIRES_OPENAIS)
- REQUIRES_OPENAIS_DEVEL="Requires: openais-devel"
- AC_SUBST(REQUIRES_OPENAIS_DEVEL)
+ SPEC_REQUIRES_OPENAIS="Requires: openais"
+ AC_SUBST(SPEC_REQUIRES_OPENAIS)
+ SPEC_REQUIRES_OPENAIS_DEVEL="Requires: openais-devel"
+ AC_SUBST(SPEC_REQUIRES_OPENAIS_DEVEL)
else
- LDFLAGS=$save_ldflags
+ SPEC_CONFIGURE_OPTS=--disable-cluster
+ AC_SUBST(SPEC_CONFIGURE_OPTS)
+ LDFLAGS=$save_ldflags
fi
# Files to generate
Modified: incubator/qpid/trunk/qpid/cpp/qpidc.spec.in
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/qpidc.spec.in?view=diff&rev=561952&r1=561951&r2=561952
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/qpidc.spec.in (original)
+++ incubator/qpid/trunk/qpid/cpp/qpidc.spec.in Wed Aug 1 14:14:26 2007
@@ -52,7 +52,7 @@
Summary: An AMQP message broker daemon
Group: System Environment/Daemons
Requires: %name = %version-%release
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
%description -n %{qpidd}
A message broker daemon that receives stores and routes messages using
@@ -63,7 +63,7 @@
Group: Development/System
Requires: %name-devel = %version-%release
Requires: %{qpidd} = %version-%release
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
%description -n %{qpidd}-devel
Libraries and header files for developing extensions to the
@@ -73,7 +73,7 @@
%setup -q
%build
-%configure --disable-static
+%configure --disable-static @SPEC_CONFIGURE_OPTS@
make %{?_smp_mflags}
# Remove this generated perl file, we don't need it and it upsets rpmlint.
rm docs/api/html/installdox
@@ -150,6 +150,10 @@
/sbin/ldconfig
%changelog
+
+
+* Wed aug 1 2007 Alan Conway <[EMAIL PROTECTED]> - 0.2-6
+- added --disable-cluster flag
* Tue Apr 17 2007 Alan Conway <[EMAIL PROTECTED]> - 0.2-5
- Add missing Requires: e2fsprogs-devel for qpidc-devel.
