From 8d9961e63786cf8a9bb9e2f4140ab9a77f1ccbe3 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 31 Jan 2018 16:38:34 +0100 Subject: build: add --without-server option With Gluster 4.0 we will not provide the server components for EL6 and older. At one point Gluster 4.x will get GlusterD2, which requires Golang tools in the distribution. EL6 does not contain these at the moment. With this change, it is possible to `./configure --without-server` which prevents building glusterd and the xlators for the bricks. Building RPMs can pass `--without server` and the glusterfs-server sub-package will not be created. Change-Id: I97f5ccf9f2c76e60d9af83915fc59fae57ad6d25 BUG: 1074947 Signed-off-by: Niels de Vos --- xlators/experimental/dht2/dht2-server/src/Makefile.am | 4 +++- xlators/experimental/fdl/src/Makefile.am | 4 ++++ xlators/experimental/jbr-client/src/Makefile.am | 2 ++ xlators/experimental/jbr-server/src/Makefile.am | 2 ++ xlators/experimental/posix2/ds/src/Makefile.am | 4 +++- xlators/experimental/posix2/mds/src/Makefile.am | 4 +++- 6 files changed, 17 insertions(+), 3 deletions(-) (limited to 'xlators/experimental') diff --git a/xlators/experimental/dht2/dht2-server/src/Makefile.am b/xlators/experimental/dht2/dht2-server/src/Makefile.am index 808c724ec9e..12d66d126f0 100644 --- a/xlators/experimental/dht2/dht2-server/src/Makefile.am +++ b/xlators/experimental/dht2/dht2-server/src/Makefile.am @@ -1,5 +1,7 @@ -xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental +if WITH_SERVER xlator_LTLIBRARIES = dht2s.la +endif +xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental dht2s_sources = dht2-server-main.c diff --git a/xlators/experimental/fdl/src/Makefile.am b/xlators/experimental/fdl/src/Makefile.am index b886b2e2ee3..da80ce28317 100644 --- a/xlators/experimental/fdl/src/Makefile.am +++ b/xlators/experimental/fdl/src/Makefile.am @@ -1,5 +1,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental +if WITH_SERVER xlator_LTLIBRARIES = fdl.la +endif noinst_HEADERS = fdl.h @@ -7,7 +9,9 @@ nodist_fdl_la_SOURCES = fdl.c fdl_la_LDFLAGS = -module -avoid-version fdl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +if WITH_SERVER sbin_PROGRAMS = gf_logdump gf_recon +endif gf_logdump_SOURCES = logdump.c nodist_gf_logdump_SOURCES = libfdl.c gf_logdump_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ diff --git a/xlators/experimental/jbr-client/src/Makefile.am b/xlators/experimental/jbr-client/src/Makefile.am index a20c9944b92..a894e69c8d7 100644 --- a/xlators/experimental/jbr-client/src/Makefile.am +++ b/xlators/experimental/jbr-client/src/Makefile.am @@ -1,4 +1,6 @@ +if WITH_SERVER xlator_LTLIBRARIES = jbrc.la +endif xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental nodist_jbrc_la_SOURCES = jbrc-cg.c diff --git a/xlators/experimental/jbr-server/src/Makefile.am b/xlators/experimental/jbr-server/src/Makefile.am index 5dc0273b2f7..fe1342dbaff 100644 --- a/xlators/experimental/jbr-server/src/Makefile.am +++ b/xlators/experimental/jbr-server/src/Makefile.am @@ -1,4 +1,6 @@ +if WITH_SERVER xlator_LTLIBRARIES = jbr.la +endif xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental nodist_jbr_la_SOURCES = jbr-cg.c diff --git a/xlators/experimental/posix2/ds/src/Makefile.am b/xlators/experimental/posix2/ds/src/Makefile.am index 7b9e2739fc8..d77ef8cb540 100644 --- a/xlators/experimental/posix2/ds/src/Makefile.am +++ b/xlators/experimental/posix2/ds/src/Makefile.am @@ -1,5 +1,7 @@ -xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental +if WITH_SERVER xlator_LTLIBRARIES = posix2-ds.la +endif +xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental posix2_ds_sources = posix2-ds-main.c diff --git a/xlators/experimental/posix2/mds/src/Makefile.am b/xlators/experimental/posix2/mds/src/Makefile.am index fce1871b01a..c6411f46114 100644 --- a/xlators/experimental/posix2/mds/src/Makefile.am +++ b/xlators/experimental/posix2/mds/src/Makefile.am @@ -1,5 +1,7 @@ -xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental +if WITH_SERVER xlator_LTLIBRARIES = posix2-mds.la +endif +xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/experimental posix2_mds_sources = posix2-mds-main.c -- cgit