[Cluster-devel] cluster configure

[Cluster-devel] cluster configure

[cfeist]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	cfeist at sourceware.org	2006-06-14 20:44:36

Modified files:
	.              : configure 

Log message:
	Fix configure script so we don't try to pass ccsincdir & ccslib dir to
	rgmanager.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.12&r2=1.13

--- cluster/configure	2006/06/12 17:25:38	1.12
+++ cluster/configure	2006/06/14 20:44:35	1.13
@@ -31,7 +31,7 @@
 (cd gnbd; ./configure $@ --gnbdkincdir=`pwd`/../gnbd-kernel/src) 
 
 echo "configure rgmanager"
-(cd rgmanager; ./configure $@ --ccsincdir=`pwd`/../ccs/lib --ccslibdir=`pwd`/../ccs/lib)
+(cd rgmanager; ./configure $@) 
 
 echo "configure cmirror"
 (cd cmirror; ./configure $@)

[Cluster-devel] cluster configure

[jbrassow]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	jbrassow at sourceware.org	2006-06-28 19:54:32

Modified files:
	.              : configure 

Log message:
	- cmirror is not ready to compile in HEAD

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.13&r2=1.14

--- cluster/configure	2006/06/14 20:44:35	1.13
+++ cluster/configure	2006/06/28 19:54:32	1.14
@@ -33,5 +33,5 @@
 echo "configure rgmanager"
 (cd rgmanager; ./configure $@) 
 
-echo "configure cmirror"
-(cd cmirror; ./configure $@)
+#echo "configure cmirror"
+#(cd cmirror; ./configure $@)

[Cluster-devel] cluster configure

[rpeterso]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rpeterso at sourceware.org	2006-07-19 14:04:54

Modified files:
	.              : configure 

Log message:
	Remove iddev from configure script.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.14&r2=1.15

--- cluster/configure	2006/06/28 19:54:32	1.14
+++ cluster/configure	2006/07/19 14:04:54	1.15
@@ -22,10 +22,10 @@
 (cd gfs-kernel; ./configure $@ --dlmkincdir=`pwd`/../dlm-kernel/src2)
 
 echo "configure gfs"
-(cd gfs; ./configure $@ --gfskincdir=`pwd`/../gfs-kernel/src/gfs --iddevlibdir=`pwd`/../iddev/lib --iddevincdir=`pwd`/../iddev/lib)
+(cd gfs; ./configure $@ --gfskincdir=`pwd`/../gfs-kernel/src/gfs
 
 echo "configure gfs2"
-(cd gfs2; ./configure $@ --gfs2kincdir=`pwd`/../gfs2-kernel/src/gfs2 --iddevlibdir=`pwd`/../iddev/lib --iddevincdir=`pwd`/../iddev/lib)
+(cd gfs2; ./configure $@ --gfs2kincdir=`pwd`/../gfs2-kernel/src/gfs2
 
 echo "configure gnbd"
 (cd gnbd; ./configure $@ --gnbdkincdir=`pwd`/../gnbd-kernel/src) 

[Cluster-devel] cluster configure

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-07-19 14:51:22

Modified files:
	.              : configure 

Log message:
	set cmanlibdir for group

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.15&r2=1.16

--- cluster/configure	2006/07/19 14:04:54	1.15
+++ cluster/configure	2006/07/19 14:51:22	1.16
@@ -10,7 +10,7 @@
 (cd cman; ./configure $@ --ccsincdir=`pwd`/../ccs/lib --ccslibdir=`pwd`/../ccs/lib)
 
 echo "configure group"
-(cd group; ./configure $@)
+(cd group; ./configure $@ --cmanlibdir=`pwd`/../cman/lib)
 
 echo "configure dlm"
 (cd dlm; ./configure $@)

[Cluster-devel] cluster configure

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-07-19 17:13:48

Modified files:
	.              : configure 

Log message:
	some trailing )'s were left out

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.16&r2=1.17

--- cluster/configure	2006/07/19 14:51:22	1.16
+++ cluster/configure	2006/07/19 17:13:48	1.17
@@ -22,10 +22,10 @@
 (cd gfs-kernel; ./configure $@ --dlmkincdir=`pwd`/../dlm-kernel/src2)
 
 echo "configure gfs"
-(cd gfs; ./configure $@ --gfskincdir=`pwd`/../gfs-kernel/src/gfs
+(cd gfs; ./configure $@ --gfskincdir=`pwd`/../gfs-kernel/src/gfs)
 
 echo "configure gfs2"
-(cd gfs2; ./configure $@ --gfs2kincdir=`pwd`/../gfs2-kernel/src/gfs2
+(cd gfs2; ./configure $@ --gfs2kincdir=`pwd`/../gfs2-kernel/src/gfs2)
 
 echo "configure gnbd"
 (cd gnbd; ./configure $@ --gnbdkincdir=`pwd`/../gnbd-kernel/src) 

[Cluster-devel] cluster configure

[rpeterso]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rpeterso at sourceware.org	2006-08-02 22:47:48

Modified files:
	.              : configure 

Log message:
	The gfs2 userland tools weren't compiling when cluster configure
	was used because the gfs2kincdir was being overridden.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.18&r2=1.19

--- cluster/configure	2006/07/20 15:11:16	1.18
+++ cluster/configure	2006/08/02 22:47:48	1.19
@@ -25,7 +25,7 @@
 (cd gfs; ./configure $@ --gfskincdir=`pwd`/../gfs-kernel/src/gfs)
 
 echo "configure gfs2"
-(cd gfs2; ./configure $@ --gfs2kincdir=`pwd`/../gfs2-kernel/src/gfs2)
+(cd gfs2; ./configure $@)
 
 echo "configure gnbd"
 (cd gnbd; ./configure $@ --gnbdkincdir=`pwd`/../gnbd-kernel/src --cmanincdir=`pwd`/../cman/lib)

[Cluster-devel] cluster configure

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-10-05 16:50:57

Modified files:
	.              : configure 

Log message:
	don't configure gfs-kernel or gnbd-kernel now that they're not built
	by default

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.19&r2=1.20

--- cluster/configure	2006/08/02 22:47:48	1.19
+++ cluster/configure	2006/10/05 16:50:57	1.20
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-echo "configure gnbd-kernel"
-(cd gnbd-kernel; ./configure $@)
+# echo "configure gnbd-kernel"
+# (cd gnbd-kernel; ./configure $@)
 
 echo "configure ccs"
 (cd ccs; ./configure $@)
@@ -18,8 +18,8 @@
 echo "configure fence"
 (cd fence; ./configure $@ -ccslibdir=`pwd`/../ccs/lib --ccsincdir=`pwd`/../ccs/lib --cmanincdir=`pwd`/../cman/lib)
 
-echo "configure gfs-kernel"
-(cd gfs-kernel; ./configure $@ --dlmkincdir=`pwd`/../dlm-kernel/src2)
+#echo "configure gfs-kernel"
+#(cd gfs-kernel; ./configure $@ --dlmkincdir=`pwd`/../dlm-kernel/src2)
 
 echo "configure gfs"
 (cd gfs; ./configure $@ --gfskincdir=`pwd`/../gfs-kernel/src/gfs)

[Cluster-devel] cluster configure

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-05-21 10:16:38

Modified files:
	.              : configure 

Log message:
	Fix typo in openaisincdir

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.23&r2=1.24

--- cluster/configure	2007/05/02 12:39:31	1.23
+++ cluster/configure	2007/05/21 10:16:38	1.24
@@ -46,7 +46,7 @@
 	ncurseslibdir => \$ncurseslibdir,
 	readlineincdir => \$readlineincdir,
 	readlinelibdir => \$readlinelibdir,
-	openaisncdir => \$openaisincdir,
+	openaisincdir => \$openaisincdir,
 	openaislibdir => \$openaislibdir,
 	virtincdir => \$virtincdir,
 	virtlibdir => \$virtlibdir,

[Cluster-devel] cluster configure

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-06-06 08:42:12

Modified files:
	.              : configure 

Log message:
	Fix LDFLAGS override:
	
	/lib and /usr/lib don't need to be specified at link time.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.24&r2=1.25

--- cluster/configure	2007/05/21 10:16:38	1.24
+++ cluster/configure	2007/06/06 08:42:12	1.25
@@ -133,7 +133,7 @@
   print "--cc=\t\tcompiler to use.  (Default: gcc)\n";
   print "--cflags=\toverride default CFLAGS settings.  (Default: -Wall)\n";
   print "--extracflags=\tadd extra compiler options to default CFLAGS setting.  (Default: none)\n";
-  print "--ldflags=\toverride default LDFLAGS settings.  (Default: -L/lib -L/usr/lib)\n";
+  print "--ldflags=\toverride default LDFLAGS settings.  (Default: none)\n";
   print "--extraldflags=\tadd extra linking options to default LDFLAGS settings.  (Default: none)\n";
   print "--kernel_src=\tthe directory containing the kernel source you wish to\n\t\tcompile against. (Default: /lib/modules/`uname -r`/build)\n";
   print "--incdir=\tthe base directory for include files.  (Default: {prefix}/usr/include)\n";
@@ -177,9 +177,6 @@
 if ($extracflags) {
   $cflags="${cflags} ${extracflags}"
 }
-if (!$ldflags) {
-  $ldflags="-L/lib -L/usr/lib"
-}
 if ($extraldflags) {
   $ldflags="${ldflags} ${extraldflags}"
 }

[Cluster-devel] cluster configure

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2007-09-06 16:24:53

Modified files:
	.              : configure 

Log message:
	go back to a default of -O0 instead of -O2 to get the stuff with -Werror
	to build

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.27&r2=1.28

--- cluster/configure	2007/08/28 04:35:38	1.27
+++ cluster/configure	2007/09/06 16:24:53	1.28
@@ -134,7 +134,7 @@
   print "\nbuild flags:\n";
   print "--cc=\t\tcompiler to use.  (Default: gcc)\n";
   print "--debug\t\tEnable debugging build. Changes default CFLAGS to -Wall -O0 -DDEBUG -g.\n";
-  print "--cflags=\toverride default CFLAGS settings.  (Default: -Wall -O2 -g)\n";
+  print "--cflags=\toverride default CFLAGS settings.  (Default: -Wall -O -g)\n";
   print "--extracflags=\tadd extra compiler options to default CFLAGS setting.  (Default: none)\n";
   print "--ldflags=\toverride default LDFLAGS settings.  (Default: none)\n";
   print "--extraldflags=\tadd extra linking options to default LDFLAGS settings.  (Default: none)\n";
@@ -177,7 +177,7 @@
 if (!$cflags) {
   $cflags="-Wall";
   if (!$debug) {
-    $cflags="${cflags} -O2";
+    $cflags="${cflags} -O";
   } else {
     $cflags="${cflags} -O0 -DDEBUG";
   }

[Cluster-devel] cluster configure

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2007-09-06 16:26:47

Modified files:
	.              : configure 

Log message:
	forgot the 0 after the -O

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.28&r2=1.29

--- cluster/configure	2007/09/06 16:24:53	1.28
+++ cluster/configure	2007/09/06 16:26:47	1.29
@@ -134,7 +134,7 @@
   print "\nbuild flags:\n";
   print "--cc=\t\tcompiler to use.  (Default: gcc)\n";
   print "--debug\t\tEnable debugging build. Changes default CFLAGS to -Wall -O0 -DDEBUG -g.\n";
-  print "--cflags=\toverride default CFLAGS settings.  (Default: -Wall -O -g)\n";
+  print "--cflags=\toverride default CFLAGS settings.  (Default: -Wall -O0 -g)\n";
   print "--extracflags=\tadd extra compiler options to default CFLAGS setting.  (Default: none)\n";
   print "--ldflags=\toverride default LDFLAGS settings.  (Default: none)\n";
   print "--extraldflags=\tadd extra linking options to default LDFLAGS settings.  (Default: none)\n";
@@ -177,7 +177,7 @@
 if (!$cflags) {
   $cflags="-Wall";
   if (!$debug) {
-    $cflags="${cflags} -O";
+    $cflags="${cflags} -O0";
   } else {
     $cflags="${cflags} -O0 -DDEBUG";
   }

[Cluster-devel] cluster configure

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2007-09-14 14:32:04

Modified files:
	.              : configure 

Log message:
	go back to default of -02 now that -Werror problems are fixed

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.30&r2=1.31

--- cluster/configure	2007/09/07 14:21:29	1.30
+++ cluster/configure	2007/09/14 14:32:04	1.31
@@ -136,7 +136,7 @@
   print "\nbuild flags:\n";
   print "--cc=\t\tcompiler to use.  (Default: gcc)\n";
   print "--debug\t\tEnable debugging build. Changes default CFLAGS to -Wall -O0 -DDEBUG -g.\n";
-  print "--cflags=\toverride default CFLAGS settings.  (Default: -Wall -O0 -g)\n";
+  print "--cflags=\toverride default CFLAGS settings.  (Default: -Wall -O2 -g)\n";
   print "--extracflags=\tadd extra compiler options to default CFLAGS setting.  (Default: none)\n";
   print "--ldflags=\toverride default LDFLAGS settings.  (Default: none)\n";
   print "--extraldflags=\tadd extra linking options to default LDFLAGS settings.  (Default: none)\n";
@@ -180,7 +180,7 @@
 if (!$cflags) {
   $cflags="-Wall";
   if (!$debug) {
-    $cflags="${cflags} -O0";
+    $cflags="${cflags} -O2";
   } else {
     $cflags="${cflags} -O0 -DDEBUG";
   }

[Cluster-devel] cluster configure

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-09-24 14:43:13

Modified files:
	.              : configure 

Log message:
	switch permanently to perl -w
	
	fix all the warnings in the script. Thanks to Patrick for spotting an extra one.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.33&r2=1.34

--- cluster/configure	2007/09/24 14:39:41	1.33
+++ cluster/configure	2007/09/24 14:43:13	1.34
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 
 ###############################################################################
 ###############################################################################
@@ -142,7 +142,7 @@
 # Check for the --help flag
 if ($help || !$err) {
   $_ = $0;
-  s/.*\.\/(.*)/\1/;
+  s/.*\.\/(.*)/$1/;
   print "Usage: $_ [flags]\n";
   print "--help\t\tPrints this usage information\n\n";
   print "install flags:\n";
@@ -219,6 +219,9 @@
 if ($extracflags) {
   $cflags="${cflags} ${extracflags}";
 }
+if (!$ldflags) {
+  $ldflags="";
+}
 if ($extraldflags) {
   $ldflags="${ldflags} ${extraldflags}";
 }
@@ -335,6 +338,45 @@
 if (!$sharedir) {
   $sharedir="${prefix}/share/cluster";
 }
+if (!$fence_agents) {
+  $fence_agents="all";
+}
+if (!$enable_xen) {
+  $enable_xen="";
+}
+if (!$without_ccs) {
+  $without_ccs="";
+}
+if (!$without_cman) {
+  $without_cman="";
+}
+if (!$without_dlm) {
+  $without_dlm="";
+}
+if (!$without_group) {
+  $without_group="";
+}
+if (!$without_fence) {
+  $without_fence="";
+}
+if (!$without_gfs) {
+  $without_gfs="";
+}
+if (!$without_gfs2) {
+  $without_gfs2="";
+}
+if (!$without_gnbd) {
+  $without_gnbd="";
+}       
+if (!$without_rgmanager) {
+  $without_rgmanager="";
+}
+if (!$release_major) {
+  $release_major="";
+}
+if (!$release_minor) {
+  $release_minor="";
+}
 
 @args = "find fence/agents -mindepth 2 -maxdepth 2 -name Makefile -printf '%h'";
 open (IFILE, "@args |");
@@ -345,12 +387,12 @@
 }
 close IFILE;
 
-if ($fence_agents eq help) {
+if ($fence_agents eq "help") {
   print "Available fence agents:\n$all_fence\n";
   exit 0;
 }
 
-if ((!$fence_agents) || ($fence_agents eq all)) {
+if ((!$fence_agents) || ($fence_agents eq "all")) {
   print "\nThe following fence agents will be build on this system:\n$all_fence\n";
   print "\nNOTE: xvm will build only if --enable_xen has been specified\n\n";
   $fence_agents = $all_fence

[Cluster-devel] cluster configure

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-09-28 06:19:08

Modified files:
	.              : configure 

Log message:
	configure: Backticks don't work in strings.  Use POSIX::uname().
	
	The strings that use backticks to get `uname -r` don't work as expected.
	Let's use POSIX::uname() directly and let perl do the work.
	
	Patch by Joel Becker <joel.becker@oracle.com>

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.34&r2=1.35

--- cluster/configure	2007/09/24 14:43:13	1.34
+++ cluster/configure	2007/09/28 06:19:08	1.35
@@ -14,6 +14,7 @@
 ###############################################################################
 
 use Getopt::Long;
+use POSIX qw(uname);
 
 print "\nConfiguring Makefiles for your system...\n";
 
@@ -228,22 +229,24 @@
 if (!$prefix) {
   $prefix="/usr";
 }
+
+my @un = POSIX::uname();
 if (!$kernel_build) {
-  if (-d "/lib/modules/`uname -r`/build") {
-    $kernel_build="/lib/modules/`uname -r`/build";
+  if (-d "/lib/modules/$un[2]/build") {
+    $kernel_build="/lib/modules/$un[2]/build";
   } else {
     $kernel_build="/usr/src/linux";
   }
 }
 if (!$kernel_src) {
-  if (-d "/lib/modules/`uname -r`/source") {
-    $kernel_src="/lib/modules/`uname -r`/source";
+  if (-d "/lib/modules/$un[2]/source") {
+    $kernel_src="/lib/modules/$un[2]/source";
   } else {
     $kernel_src=$kernel_build;
   }
 }
 if (!$module_dir) {
-  $module_dir="/lib/modules/`uname -r`/kernel";
+  $module_dir="/lib/modules/$un[2]/kernel";
 }
 if (!$gfskincdir) {
   $gfskincdir="${pwd}/gfs-kernel/src/gfs";

[Cluster-devel] cluster configure

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-10-01 03:28:12

Modified files:
	.              : configure 

Log message:
	Fix configure to handle properly 0.x or x.0 releases.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.35&r2=1.36

--- cluster/configure	2007/09/28 06:19:08	1.35
+++ cluster/configure	2007/10/01 03:28:12	1.36
@@ -374,10 +374,10 @@
 if (!$without_rgmanager) {
   $without_rgmanager="";
 }
-if (!$release_major) {
+if (not length $release_major) {
   $release_major="";
 }
-if (!$release_minor) {
+if (not length $release_minor) {
   $release_minor="";
 }
 

[Cluster-devel] cluster configure

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rmccabe at sourceware.org	2007-10-26 19:18:55

Modified files:
	.              : configure 

Log message:
	Compile with -Wformat=2, which will catch usually dangerous format string bugs

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.36&r2=1.37

--- cluster/configure	2007/10/01 03:28:12	1.36
+++ cluster/configure	2007/10/26 19:18:55	1.37
@@ -209,7 +209,7 @@
   $cc="gcc";
 }
 if (!$cflags) {
-  $cflags="-Wall";
+  $cflags="-Wall -Wformat=2";
   if (!$debug) {
     $cflags="${cflags} -O2";
   } else {

[Cluster-devel] cluster configure

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-11-24 04:57:31

Modified files:
	.              : configure 

Log message:
	Switch configure to use perl warnings and fix them up.
	
	Add kernel_version version check subroutine.
	
	Set minimal kernel version requirement to 2.6.23.
	
	Many thanks should go to Marian Marinov <mm@yuhu.biz> for the original
	patch and contribution.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.37&r2=1.38

--- cluster/configure	2007/10/26 19:18:55	1.37
+++ cluster/configure	2007/11/24 04:57:31	1.38
@@ -13,16 +13,22 @@
 ###############################################################################
 ###############################################################################
 
+use warnings;
 use Getopt::Long;
 use POSIX qw(uname);
 
+
 print "\nConfiguring Makefiles for your system...\n";
 
 # Set a bunch of variables
 
-$ret = 0;
+my $ret = 0;
+
+# this should be only the major version without the extra version 
+# eg. only the first 3 digits
+my $required_kernelversion = '2.6.23';
 
-%options = (
+my %options = (
 	help => \$help,
 	cc => \$cc,
 	debug => \$debug,
@@ -80,7 +86,7 @@
 	without_rgmanager => \$without_rgmanager,
 );
 
-$err = &GetOptions (\%options,
+my $err = &GetOptions (\%options,
 		    'help',
 		    'cc=s',
 		    'debug',
@@ -202,6 +208,67 @@
   exit $ret;
 }
 
+sub kernel_version {
+  my $autoconf_path = shift;
+  my $required_version = shift;
+  my $build_version = 0;
+  my $build_patchlevel = 0;
+  my $build_sublevel = 0;
+
+  print "\nChecking kernel:\n";
+
+  # add autoconf to the path
+  $autoconf_path .= '/include/linux/autoconf.h';
+  my @version = split /\./, $required_version;
+  my $current_version = 0;
+  if ( -f $autoconf_path ) {
+    # open the autoconf.h to feth VERSION, PATCHLEVEL and SUBLEVEL, if needed I can add EXTRAVERSION too
+    open AUTOCONF, '<', $autoconf_path;
+    while (<AUTOCONF>) {
+      if ($_ =~ /CONFIG_KERNELVERSION/) {
+        $current_version = $_;
+        # we don't need to check any thing else in this file so we are stopping the read
+        last;
+      }
+    }
+    close AUTOCONF;
+    # leaving only the numbers from the lines
+    # this is faster then split and doesn't alocate useless arrays
+    $current_version =~ s/.*"(.*)"\n/$1/;
+    # parse the kernel version into the variables
+    if ($current_version =~ /\-/) {
+        my @line = split /\-/, $current_version;
+        my @ver  = split /\./, $line[0];
+        $build_version = $ver[0];
+        $build_patchlevel = $ver[1];
+        $build_sublevel = $ver[2];
+    } else {
+        my @kernel = split /\./, $current_version;
+        $build_version = $kernel[0];
+        $build_patchlevel = $kernel[1];
+        $build_sublevel = $kernel[2];
+    }
+    # checking VERSION, PATCHLEVEL and SUBLEVEL for the supplied kernel
+    # if needed I can add also EXTRAVERSION to the check
+    if ($build_version >= $version[0] &&
+        $build_patchlevel >= $version[1] &&
+        $build_sublevel >= $version[2]) {
+      print " Current kernel version appears to be OK\n";
+      return 1;
+    } else {
+      print " Current kernel version: ",$current_version,"\n Minimum kernel version: ",$required_version,"\n";
+      print " FAILED!\n";
+      return 0;
+    }
+  } else {
+    print " Unable to find ($autoconf_path)!\n";
+    print " Make sure that:\n - the above path is correct\n";
+    print " - your kernel is properly configured and prepared.\n";
+    print " - kernel_build and kernel_src options to configure are set properly.\n";
+    return 0;
+  }
+}
+
 $pwd = `pwd`;
 chomp($pwd);
 
@@ -245,6 +312,9 @@
     $kernel_src=$kernel_build;
   }
 }
+if (!kernel_version($kernel_build,$required_kernelversion)) {
+  exit 1;
+}
 if (!$module_dir) {
   $module_dir="/lib/modules/$un[2]/kernel";
 }
@@ -374,10 +444,10 @@
 if (!$without_rgmanager) {
   $without_rgmanager="";
 }
-if (not length $release_major) {
+if (defined($release_major) && not length $release_major) {
   $release_major="";
 }
-if (not length $release_minor) {
+if (defined($release_minor) && not length $release_minor) {
   $release_minor="";
 }
 
@@ -462,7 +532,7 @@
 }
 
 close IFILE;
-if ((not length $release_major) || (not length $release_minor)) {
+if ((not defined($release_major)) || (not defined($release_minor))) {
   open IFILE, "<make/release.mk.input" or die "Can't redirect stdin";
   while (<IFILE>) {
     chomp;

[Cluster-devel] cluster configure

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-12-06 10:38:00

Modified files:
	.              : configure 

Log message:
	Add option to disable kernel_check.
	
	From Soren Hansen:
	"It's handy to be able to
	disable the new kernel version check if we don't actually have the
	kernel headers around, but know that the proper stuff is around when
	it's needed."

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.38&r2=1.39

--- cluster/configure	2007/11/24 04:57:31	1.38
+++ cluster/configure	2007/12/06 10:38:00	1.39
@@ -84,6 +84,7 @@
 	without_gfs2 => \$without_gfs2,
 	without_gnbd => \$without_gnbd,
 	without_rgmanager => \$without_rgmanager,
+	disable_kernel_check => \$disable_kernel_check,
 );
 
 my $err = &GetOptions (\%options,
@@ -139,7 +140,8 @@
 		    'without_gfs',
 		    'without_gfs2',
 		    'without_gnbd',
-		    'without_rgmanager');
+		    'without_rgmanager',
+		    'disable_kernel_check');
 
 if(!$err) {
   $ret = 1;
@@ -205,6 +207,7 @@
   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";
   exit $ret;
 }
 
@@ -312,7 +315,7 @@
     $kernel_src=$kernel_build;
   }
 }
-if (!kernel_version($kernel_build,$required_kernelversion)) {
+if (not $disable_kernel_check and !kernel_version($kernel_build,$required_kernelversion)) {
   exit 1;
 }
 if (!$module_dir) {
@@ -444,6 +447,9 @@
 if (!$without_rgmanager) {
   $without_rgmanager="";
 }
+if (!$disable_kernel_check) {
+  $disable_kernel_check=0;
+}
 if (defined($release_major) && not length $release_major) {
   $release_major="";
 }

[Cluster-devel] cluster configure

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-12-19 05:48:36

Modified files:
	.              : configure 

Log message:
	Fix extracflags and extraldflags to be recognized as options or configure will
	fail.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.40&r2=1.41

--- cluster/configure	2007/12/07 00:53:44	1.40
+++ cluster/configure	2007/12/19 05:48:35	1.41
@@ -94,7 +94,9 @@
 		    'cc=s',
 		    'debug',
 		    'cflags=s',
+		    'extracflags=s',
 		    'ldflags=s',
+		    'extraldflags=s',
 		    'kernel_build=s',
 		    'kernel_src=s',
 		    'module_dir=s',

[Cluster-devel] cluster configure

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-12-21 05:58:34

Modified files:
	.              : configure 

Log message:
	Fix 2 corner cases when setting up the objdir:
	
	- do not symlink symlinks.. this allows to setup multiple objdirs within the
	source tree.
	
	- do not copy/symlink defines.mk from other trees or bad thing happens.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.43&r2=1.44

--- cluster/configure	2007/12/20 22:09:56	1.43
+++ cluster/configure	2007/12/21 05:58:34	1.44
@@ -287,11 +287,12 @@
 sub symlinks {
   my $dir = shift;
   my $pattern = shift;
-  @args = "find $dir -name $pattern";
+  @args = "find $dir -type f -name $pattern";
   open (IFILE, "@args |");
   while (<IFILE>) {
     chomp;
     s|\./||g;
+    s|.*make\/defines.mk||g;
     $dirname = dirname($_);
     $filename = basename($_);
     system("mkdir -p $objdir/$dirname");

[Cluster-devel] cluster configure

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-12-21 07:28:37

Modified files:
	.              : configure 

Log message:
	Minor objdir rework to extend flexibility.
	
	the first shot of objdir implementation implied that you did:
	
	cd cluster
	./configure --objdir... etc.
	cd /path/to/objdir
	make
	
	now you can:
	
	mkdir objdir
	cd objdir
	/path/to/configure
	make
	
	NOTE: in this case you don't need to specify objdir. it will be automatically
	set up for you.
	
	As a nice side effect you can also be anywhere on the fs and do:
	
	/path/to/configure --objdir=/path/to/obj
	cd /path/to/obj
	make
	
	and it will work.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.44&r2=1.45

--- cluster/configure	2007/12/21 05:58:34	1.44
+++ cluster/configure	2007/12/21 07:28:37	1.45
@@ -296,7 +296,7 @@
     $dirname = dirname($_);
     $filename = basename($_);
     system("mkdir -p $objdir/$dirname");
-    symlink("${pwd}/$_","$objdir/$dirname/$filename");
+    symlink("${cdir}/$_","$objdir/$dirname/$filename");
   }
   close IFILE;
   return 0;
@@ -330,22 +330,27 @@
   $prefix="/usr";
 }
 
+print "\nChecking tree: ";
 if (!$objdir) {
   $objdir="${pwd}";
+}
+$objdir = abs_path( $objdir );
+$cdir = dirname ( abs_path( $0 ) );
+unless ("$cdir" eq "$objdir") {
+  chdir "$cdir";
+}
+
+if (! -d "$objdir/make") {
+  print "setting up $objdir\n";
+  mkdir "$objdir";
+  symlinks(".","Makefile");
+  symlinks(".","*.mk");
+  symlinks("gnbd-kernel","*.c");
+  symlinks("gnbd-kernel","*.h");
+  symlinks("gfs-kernel","*.c");
+  symlinks("gfs-kernel","*.h");
 } else {
-  $objdir = abs_path( $objdir );
-  if (! -d $objdir) {
-    print "\nSetting up objdir in $objdir\n";
-    mkdir "$objdir";
-    symlinks(".","Makefile");
-    symlinks(".","*.mk");
-    symlinks("gnbd-kernel","*.c");
-    symlinks("gnbd-kernel","*.h");
-    symlinks("gfs-kernel","*.c");
-    symlinks("gfs-kernel","*.h");
-  } else {
-    print "\nFound old objdir in $objdir: no actions taken\n";
-  }
+  print "nothing to do\n";
 }
 
 my @un = POSIX::uname();
@@ -370,10 +375,10 @@
   $module_dir="/lib/modules/$un[2]/kernel";
 }
 if (!$gfskincdir) {
-  $gfskincdir="${pwd}/gfs-kernel/src/gfs";
+  $gfskincdir="${cdir}/gfs-kernel/src/gfs";
 }
 if (!$gnbdkincdir) {
-  $gnbdkincdir="${pwd}/gnbd-kernel/src";
+  $gnbdkincdir="${cdir}/gnbd-kernel/src";
 }
 if (!$incdir) {
   $incdir="${prefix}/include";
@@ -382,19 +387,19 @@
   $libdir="${prefix}/lib";
 }
 if (!$ccsincdir) {
-  $ccsincdir="${pwd}/ccs/lib";
+  $ccsincdir="${cdir}/ccs/lib";
 }
 if (!$ccslibdir) {
   $ccslibdir="${objdir}/ccs/lib";
 }
 if (!$cmanincdir) {
-  $cmanincdir="${pwd}/cman/lib";
+  $cmanincdir="${cdir}/cman/lib";
 }
 if (!$cmanlibdir) {
   $cmanlibdir="${objdir}/cman/lib";
 }
 if (!$dlmincdir) {
-  $dlmincdir="${pwd}/dlm/lib";
+  $dlmincdir="${cdir}/dlm/lib";
 }
 if (!$dlmlibdir) {
   $dlmlibdir="${objdir}/dlm/lib";
@@ -538,7 +543,7 @@
 
 while (<IFILE>) {
   chomp;
-  $_ =~ s/\@SRCDIR\@/$pwd/;
+  $_ =~ s/\@SRCDIR\@/$cdir/;
   $_ =~ s/\@CC\@/$cc/;
   $_ =~ s/\@CFLAGS\@/$cflags/;
   $_ =~ s/\@LDFLAGS\@/$ldflags/;

[Cluster-devel] cluster configure

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2008-01-07 18:58:29

Modified files:
	.              : configure 

Log message:
	Figure out where slang is installed.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.46&r2=1.47

--- cluster/configure	2008/01/07 05:52:26	1.46
+++ cluster/configure	2008/01/07 18:58:29	1.47
@@ -430,6 +430,9 @@
 }
 if (!$slangincdir) {
   $slangincdir="${incdir}";
+  if (! -f "$slangincdir/slang.h") {
+    $slangincdir="${incdir}/slang";
+  }
 }
 if (!$slanglibdir) {
   $slanglibdir="${libdir}";

[Cluster-devel] cluster configure

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2008-01-28 06:43:50

Modified files:
	.              : configure 

Log message:
	Bump kernel check to 2.6.24

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/configure.diff?cvsroot=cluster&r1=1.47&r2=1.48

--- cluster/configure	2008/01/07 18:58:29	1.47
+++ cluster/configure	2008/01/28 06:43:50	1.48
@@ -27,7 +27,7 @@
 
 # this should be only the major version without the extra version 
 # eg. only the first 3 digits
-my $required_kernelversion = '2.6.23';
+my $required_kernelversion = '2.6.24';
 
 my %options = (
 	help => \$help,