summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2012-11-06 10:13:07 +0100
committerAnand Avati <avati@redhat.com>2012-12-12 10:58:45 -0800
commit06d4cced24f9854e3439f03a0c940adc5306de48 (patch)
tree62f967cad18e85f5c35c106957bd1277af100f95 /configure.ac
parent6d58cb0476dc13198596603a9efd5014ebcb0c45 (diff)
build: include OCF resource agents by default and package them
This change introduces a glusterfs-resource-agents sub-package that contains the Open Cluster Framework (OCF) Resource Agents (RA). It also changes the build infrastructure to include the RA by default, making them available for anyone who is interested in using them with a OCF compatible Hight-Availability solution like Pacemaker. Build the RPMs without RA: $ make dist && rpmbuild -ta --without ocf *.gz Build the RPMs with RA (default): $ make dist && rpmbuild -ta *.gz There is no need to run ./autogen.sh from within the .spec, the whole autotools infrastructure is included in the 'make dist' tarball already. This also adds a test-case which builds the rpms with mock for the latest two EPEL releases. Change-Id: I12ef5f30f466868825352376156fb4e56b135c58 BUG: 869559 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/4130 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 9640c9d..f24f4a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,10 +174,11 @@ AC_ARG_WITH(launchddir,
AC_SUBST(launchddir)
AC_ARG_WITH([ocf],
- [AS_HELP_STRING([--with-ocf], [build OCF-compliant cluster resource agents])],
+ [AS_HELP_STRING([--without-ocf], [build OCF-compliant cluster resource agents])],
,
- [with_ocf=no])
-AM_CONDITIONAL(WITH_OCF, [ test "$with_ocf" = "yes" ])
+ [OCF_SUBDIR='ocf'],
+ )
+AC_SUBST(OCF_SUBDIR)
# LEX needs a check
AC_PROG_LEX