Cluster Project branch, master, updated. cluster-2.99.01-7-g81c7417

Cluster Project branch, master, updated. cluster-2.99.01-7-g81c7417

[fabbione]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=81c7417b376de2f1d4a0bd6cb0f279f37c88af7b

The branch, master has been updated
       via  81c7417b376de2f1d4a0bd6cb0f279f37c88af7b (commit)
      from  daff41e06bbb8a5332ede4e0addf4d8f94b7d33a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 81c7417b376de2f1d4a0bd6cb0f279f37c88af7b
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Fri May 16 07:41:23 2008 +0200

    [BUILD] Add --without_kernel_modules configure option
    
    Allow users to disable build of kernel modules.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 configure             |   16 ++++++++++++++--
 make/defines.mk.input |    4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 2c9ad4e..014044a 100755
--- a/configure
+++ b/configure
@@ -105,6 +105,7 @@ my %options = (
 	without_gfs2 => \$without_gfs2,
 	without_gnbd => \$without_gnbd,
 	without_rgmanager => \$without_rgmanager,
+	without_kernel_modules => \$without_kernel_modules,
 	disable_kernel_check => \$disable_kernel_check,
 );
 
@@ -183,6 +184,7 @@ my $err = &GetOptions (\%options,
 		    'without_gfs2',
 		    'without_gnbd',
 		    'without_rgmanager',
+		    'without_kernel_modules',
 		    'disable_kernel_check');
 
 if(!$err) {
@@ -267,7 +269,8 @@ if ($help || !$err) {
   print "--without_gfs2\tDisable gfs2 building  (Default: enabled)\n";
   print "--without_gnbd\tDisable gnbd building  (Default: enabled)\n";
   print "--without_rgmanager\tDisable rgmanager building  (Default: enabled)\n";
-  print "--disable_kernel_check\tDisable kernel version check (Default: enabled)\n";
+  print "--without_kernel_modules\tDisable kernel modules building  (Default: enabled)\n";
+  print "--disable_kernel_check\tDisable kernel version check  (Default: enabled)\n";
   exit $ret;
 }
 
@@ -588,10 +591,17 @@ if (!$without_gfs2) {
 }
 if (!$without_gnbd) {
   $without_gnbd="";
-}       
+}
 if (!$without_rgmanager) {
   $without_rgmanager="";
 }
+if (!$without_kernel_modules) {
+  $without_gfskernel=$without_gfs;
+  $without_gnbdkernel=$without_gnbd;
+} else {
+  $without_gfskernel=1;
+  $without_gnbdkernel=1;
+}
 if (!$disable_kernel_check) {
   $disable_kernel_check=0;
 }
@@ -697,8 +707,10 @@ while (<IFILE>) {
   $_ =~ s/\@DISABLE_GROUP\@/$without_group/;
   $_ =~ s/\@DISABLE_FENCE\@/$without_fence/;
   $_ =~ s/\@DISABLE_GFS\@/$without_gfs/;
+  $_ =~ s/\@DISABLE_GFSKERNEL\@/$without_gfskernel/;
   $_ =~ s/\@DISABLE_GFS2\@/$without_gfs2/;
   $_ =~ s/\@DISABLE_GNBD\@/$without_gnbd/;
+  $_ =~ s/\@DISABLE_GNBDKERNEL\@/$without_gnbdkernel/;
   $_ =~ s/\@DISABLE_RGMANAGER\@/$without_rgmanager/;
 
   print OFILE "$_\n";
diff --git a/make/defines.mk.input b/make/defines.mk.input
index bd6d37b..173e0bb 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -78,8 +78,8 @@ fence_agents ?= @FENCE_AGENTS@
 fenceagentslibdir ?= @FENCEAGENTSLIBDIR@
 experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@
 enable_xen ?= @ENABLE_XEN@
-without_gnbd-kernel/src ?= @DISABLE_GNBD@
-without_gfs-kernel/src/gfs ?= @DISABLE_GFS@
+without_gnbd-kernel/src ?= @DISABLE_GNBDKERNEL@
+without_gfs-kernel/src/gfs ?= @DISABLE_GFSKERNEL@
 without_cman/lib ?= @DISABLE_CMAN@
 without_ccs ?= @DISABLE_CCS@
 without_cman ?= @DISABLE_CMAN@


hooks/post-receive
--
Cluster Project