diff options
| author | Niels de Vos <ndevos@redhat.com> | 2014-12-01 09:21:32 +0100 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2014-12-07 06:16:08 -0800 |
| commit | fcdac758ad7b3dda9843f92597a15e4a30a3b746 (patch) | |
| tree | fc37a620c2b36cd8d1a2bb762265582df4d49073 | |
| parent | 36236eecef55c710e1f11ba4a04fe01da67cab6a (diff) | |
build: only install geo-rep scripts when enabled
When geo-replication is not enabled, the related scripts should not get
installed. EPEL-5 does not support geo-replication, and the installed
but unpackaged scripts cause rebuilding for .el5 to fail.
BUG: 1169005
Change-Id: I1b6a352b73bd1ed1c5b330f54e26e81aed9a5a4e
Reported-by: Lalatendu Mohanty <lmohanty@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/9221
Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | extras/Makefile.am | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 57822668f30..b3e4a00e56a 100644 --- a/configure.ac +++ b/configure.ac @@ -611,6 +611,12 @@ AC_SUBST(SYNCDAEMON_COMPILE) AC_SUBST(SYNCDAEMON_SUBDIR) # end SYNCDAEMON section +# only install scripts from extras/geo-rep when enabled +if test "x$enable_georeplication" != "xno"; then + GEOREP_EXTRAS_SUBDIR=geo-rep +fi +AC_SUBST(GEOREP_EXTRAS_SUBDIR) + # CDC xlator - check if libz is present if so enable HAVE_LIB_Z BUILD_CDC=yes PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0],, diff --git a/extras/Makefile.am b/extras/Makefile.am index b6cdb90434f..a163b1ae3a2 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -2,7 +2,7 @@ EditorModedir = $(docdir) EditorMode_DATA = glusterfs-mode.el glusterfs.vim SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \ - geo-rep + $(GEOREP_EXTRAS_SUBDIR) confdir = $(sysconfdir)/glusterfs conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \ |