From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 5 Jul 2001 17:38:19 +0000 (+0000)
Subject: allow-disabling-kernel-module-compilation-20010705
X-Git-Tag: openafs-stable-1_1_0~56
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=62994d919dda6e678ed2b72e64553b5f70e03185;p=packages%2Fo%2Fopenafs.git

allow-disabling-kernel-module-compilation-20010705


in response to reports from hartmans@mekinok.com and zacheiss@mit.edu

will also autodisable for linux if no --with-linux-kernel-headers specified
and none found
---

diff --git a/Makefile.in b/Makefile.in
index 148d59aea..bc061a7e2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,6 +28,8 @@ LIB_AFSDB=@LIB_AFSDB@
 WITH_OBSOLETE=@WITH_OBSOLETE@
 WITH_INSECURE=@WITH_INSECURE@
 
+ENABLE_KERNEL_MODULE=@ENABLE_KERNEL_MODULE@
+
 # To compile AFS from scratch in the src tree run "make SYS_NAME=<type>".
 #   This recursively calls "make install ..." and does not depend on the
 #   existence of any non-standard programs.
@@ -375,7 +377,7 @@ libadmin: libafsauthent bozo
 		echo Not building MT libadmin for ${SYS_NAME} ;; \
 	esac
 
-finale: project cmd comerr afsd allrcmds butc tbutc libafs libuafs audit kauth log package \
+finale: project cmd comerr afsd allrcmds butc tbutc @ENABLE_KERNEL_MODULE@ libuafs audit kauth log package \
 	ptserver scout bu_utils ubik uss bozo vfsck volser \
 	venus update xstat afsmonitor dauth tests libafsrpc \
 	libafsauthent libadmin
diff --git a/configure.in b/configure.in
index 5aa45be01..b5a320f3e 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AM_INIT_AUTOMAKE(openafs,devel)
 AC_CANONICAL_HOST
 AC_CONFIG_HEADER(src/config/afsconfig.h)
 
-#BOZO_SAVE_CORES BOS_RESTRICTED_MODE BOS_NEW_CONFIG pam sia  BITMAP_LATER FAST_RESTART
+#BOZO_SAVE_CORES BOS_RESTRICTED_MODE BOS_NEW_CONFIG pam sia
 AC_ARG_WITH(afs-sysname,
 [  --with-afs-sysname=sys    use sys for the afs sysname]
 )
@@ -24,6 +24,9 @@ AC_ARG_ENABLE( bitmap-later,
 AC_ARG_WITH(linux-kernel-headers,
 [  --with-linux-kernel-headers=path    	use the kernel headers found at path(optional, defaults to /usr/src/linux)]
 )
+AC_ARG_ENABLE(kernel-module,
+[  --disable-kernel-module             	disable compilation of the kernel module (defaults to enabled)],, enable_kernel_module="yes"
+)
 
 AC_PROG_CC
 
@@ -53,26 +56,34 @@ system=$host
 case $system in
         *-linux*)
 		MKAFS_OSTYPE=LINUX
-		if test "x$with_linux_kernel_headers" != "x"; then
-			LINUX_KERNEL_PATH="$with_linux_kernel_headers"
-		else
-			LINUX_KERNEL_PATH="/usr/src/linux"
-		fi
-		if test -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-		 linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_PATH/include/linux/version.h |awk 'BEGIN { FS="\"" } { print $2 }'|tail -1`
-		 if test "x$linux_kvers" = "x"; then
-		  AC_MSG_ERROR(Linux headers lack version definition)
-		  exit 1
+		if test "x$enable_kernel_module" = "xyes"; then
+		 if test "x$with_linux_kernel_headers" != "x"; then
+		   LINUX_KERNEL_PATH="$with_linux_kernel_headers"
+		 else
+		   LINUX_KERNEL_PATH="/usr/src/linux"
+		 fi
+		 if test -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
+		  linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_PATH/include/linux/version.h |awk 'BEGIN { FS="\"" } { print $2 }'|tail -1`
+		  if test "x$linux_kvers" = "x"; then
+		    AC_MSG_ERROR(Linux headers lack version definition)
+		    exit 1
+		  else
+		    LINUX_VERSION="$linux_kvers"
+		  fi
 		 else
-		  LINUX_VERSION="$linux_kvers"
+		  if test "x$with_linux_kernel_headers" != "x"; then
+		   AC_MSG_ERROR(No linux headers found at $LINUX_KERNEL_PATH)
+		   exit 1
+		  else
+		   AC_MSG_WARN(No linux headers found at $LINUX_KERNEL_PATH so disabling kernel module)
+		   enable_kernel_module="no"
 		 fi
-		else
-		 AC_MSG_ERROR(No linux headers found at $LINUX_KERNEL_PATH)
-		 exit 1
 		fi
-                AC_MSG_RESULT(linux)
-		LINUX_FS_STRUCT_INODE_HAS_I_BYTES
-		LINUX_INODE_SETATTR_RETURN_TYPE
+		AC_MSG_RESULT(linux)
+		if test "x$enable_kernel_module" = "xyes"; then
+	         LINUX_FS_STRUCT_INODE_HAS_I_BYTES
+	  	 LINUX_INODE_SETATTR_RETURN_TYPE
+		fi
                 ;;
         *-solaris*)
 		MKAFS_OSTYPE=SOLARIS
@@ -227,7 +238,12 @@ AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h)
 
 AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf re_comp re_exec)
 
+if test "x$enable_kernel_module" = "xyes"; then
+ENABLE_KERNEL_MODULE=libafs
+fi
+
 AC_SUBST(AFS_SYSNAME)
+AC_SUBST(ENABLE_KERNEL_MODULE)
 AC_SUBST(LIB_AFSDB)
 AC_SUBST(LINUX_KERNEL_PATH)
 AC_SUBST(LINUX_VERSION)