Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=287... Commit: 287c8cb0c681bf7d6c62112869105a8a7d995a4b Parent: dcfbe7b0ae44bfc84c1e6ec20f643c8bf8deefb5 Author: Fabio M. Di Nitto fdinitto@redhat.com AuthorDate: Wed Jan 6 20:28:34 2010 +0100 Committer: Fabio M. Di Nitto fdinitto@redhat.com CommitterDate: Wed Jan 6 20:28:34 2010 +0100
gfs: disable gfs kernel and userland tool build by default
it's still possible to enable them via configure
Signed-off-by: Fabio M. Di Nitto fdinitto@redhat.com --- Makefile | 9 +++++++-- configure | 18 +++++++++--------- make/defines.mk.input | 4 ++-- 3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile index b5eb7c8..223c75d 100644 --- a/Makefile +++ b/Makefile @@ -7,19 +7,24 @@ REALSUBDIRS = gfs-kernel/src/gfs \
SUBDIRS = $(filter-out \ $(if ${without_common},common) \ - $(if ${without_gfs-kernel/src/gfs},gfs-kernel/src/gfs) \ $(if ${without_config},config) \ $(if ${without_cman},cman) \ $(if ${without_dlm},dlm) \ $(if ${without_fence},fence/libfenced) \ $(if ${without_group},group) \ $(if ${without_fence},fence) \ - $(if ${without_gfs},gfs) \ $(if ${without_gfs2},gfs2) \ $(if ${without_rgmanager},rgmanager) \ $(if ${without_bindings},bindings) \ , $(REALSUBDIRS))
+ifdef enable_gfs +SUBDIRS += gfs +endif +ifdef enable_gfs-kernel/src/gfs +SUBDIRS += gfs-kernel/src/gfs +endif + all: ${SUBDIRS}
${SUBDIRS}: diff --git a/configure b/configure index 1522ccd..86c7b79 100755 --- a/configure +++ b/configure @@ -98,7 +98,7 @@ my %options = ( without_group => $without_group, without_fence => $without_fence, without_fence_agents => $without_fence_agents, - without_gfs => $without_gfs, + enable_gfs => $enable_gfs, without_gfs2 => $without_gfs2, without_rgmanager => $without_rgmanager, without_resource_agents => $without_resource_agents, @@ -186,7 +186,7 @@ my $err = &GetOptions (%options, 'without_group', 'without_fence', 'without_fence_agents', - 'without_gfs', + 'enable_gfs', 'without_gfs2', 'without_rgmanager', 'without_resource_agents', @@ -281,7 +281,7 @@ if ($help || !$err) { print "--without_group\tDisable group building (Default: enabled)\n"; print "--without_fence\tDisable fence building (Default: enabled)\n"; print "--without_fence_agents\tDisable fence_agents building (Default: enabled)\n"; - print "--without_gfs\tDisable gfs building (Default: enabled)\n"; + print "--enable_gfs\tEnable gfs building (Default: disabled)\n"; print "--without_gfs2\tDisable gfs2 building (Default: enabled)\n"; print "--without_rgmanager\tDisable rgmanager building (Default: enabled)\n"; print "--without_resource_agents\tDisable resource agents building (Default: enabled)\n"; @@ -643,8 +643,8 @@ if (!$without_fence_agents) { } else { $fence_agents="none"; } -if (!$without_gfs) { - $without_gfs=""; +if (!$enable_gfs) { + $enable_gfs=""; } if (!$without_gfs2) { $without_gfs2=""; @@ -659,9 +659,9 @@ if (!$without_bindings) { $without_bindings=""; } if (!$without_kernel_modules) { - $without_gfskernel=$without_gfs; + $enable_gfskernel=$enable_gfs; } else { - $without_gfskernel=1; + $enable_gfskernel=""; } if (!$disable_kernel_check) { $disable_kernel_check=0; @@ -781,8 +781,8 @@ while (<IFILE>) { $_ =~ s/@DISABLE_DLM@/$without_dlm/; $_ =~ s/@DISABLE_GROUP@/$without_group/; $_ =~ s/@DISABLE_FENCE@/$without_fence/; - $_ =~ s/@DISABLE_GFS@/$without_gfs/; - $_ =~ s/@DISABLE_GFSKERNEL@/$without_gfskernel/; + $_ =~ s/@ENABLE_GFS@/$enable_gfs/; + $_ =~ s/@ENABLE_GFSKERNEL@/$enable_gfskernel/; $_ =~ s/@DISABLE_GFS2@/$without_gfs2/; $_ =~ s/@DISABLE_RGMANAGER@/$without_rgmanager/; $_ =~ s/@DISABLE_RESOURCE_AGENTS@/$without_resource_agents/; diff --git a/make/defines.mk.input b/make/defines.mk.input index d36db8b..2834872 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -73,14 +73,14 @@ experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@ legacy_code ?= @ENABLE_LEGACY_CODE@ contrib_code ?= @ENABLE_CONTRIB@ enable_pacemaker ?= @ENABLE_PACEMAKER@ -without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@ +enable_gfs-kernel/src/gfs ?= @ENABLE_GFSKERNEL@ without_common ?= @DISABLE_COMMON@ without_config ?= @DISABLE_CONFIG@ without_cman ?= @DISABLE_CMAN@ without_dlm ?= @DISABLE_DLM@ without_group ?= @DISABLE_GROUP@ without_fence ?= @DISABLE_FENCE@ -without_gfs ?= @DISABLE_GFS@ +enable_gfs ?= @ENABLE_GFS@ without_gfs2 ?= @DISABLE_GFS2@ without_rgmanager ?= @DISABLE_RGMANAGER@ without_resource_agents ?= @DISABLE_RESOURCE_AGENTS@
cluster-commits@lists.stg.fedorahosted.org