diff options
| author | Alan Conway <aconway@apache.org> | 2007-08-01 21:14:26 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-08-01 21:14:26 +0000 |
| commit | 16de059e3d522762f4e2a4c23bcb5aa2516a0b37 (patch) | |
| tree | 22dc548d6939ff146aa3293b759ee2cff0716612 /cpp | |
| parent | 0844ecfe586705c20a9a7830e47afcb52281c969 (diff) | |
| download | qpid-python-16de059e3d522762f4e2a4c23bcb5aa2516a0b37.tar.gz | |
Propagate --disable-cluster to spec file
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@561952 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/configure.ac | 12 | ||||
| -rw-r--r-- | cpp/qpidc.spec.in | 10 |
2 files changed, 14 insertions, 8 deletions
diff --git a/cpp/configure.ac b/cpp/configure.ac index 86a0347248..49b7e5f298 100644 --- a/cpp/configure.ac +++ b/cpp/configure.ac @@ -153,12 +153,14 @@ fi 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 diff --git a/cpp/qpidc.spec.in b/cpp/qpidc.spec.in index c26e131f27..fdc4c5075f 100644 --- a/cpp/qpidc.spec.in +++ b/cpp/qpidc.spec.in @@ -52,7 +52,7 @@ in C++ using Qpid. Qpid implements the AMQP messaging specification. Summary: An AMQP message broker daemon Group: System Environment/Daemons Requires: %name = %version-%release -@REQUIRES_OPENAIS@ +@SPEC_REQUIRES_OPENAIS@ %description -n %{qpidd} A message broker daemon that receives stores and routes messages using @@ -63,7 +63,7 @@ Summary: Libraries and header files for developing Qpid broker extensions Group: Development/System Requires: %name-devel = %version-%release Requires: %{qpidd} = %version-%release -@REQUIRES_OPENAIS_DEVEL@ +@SPEC_REQUIRES_OPENAIS_DEVEL@ %description -n %{qpidd}-devel Libraries and header files for developing extensions to the @@ -73,7 +73,7 @@ Qpid broker daemon. %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 @@ -151,6 +151,10 @@ fi %changelog + +* Wed aug 1 2007 Alan Conway <aconway@redhat.com> - 0.2-6 +- added --disable-cluster flag + * Tue Apr 17 2007 Alan Conway <aconway@redhat.com> - 0.2-5 - Add missing Requires: e2fsprogs-devel for qpidc-devel. |