X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=configure.in;h=95424f58f0d08cf009c101a714d3841d2ea487ec;hp=4b4e209fa0e3c7b65919abd2cfa36144e8f2f418;hb=3d35839a13378d7c22aa5e22a5b8267b2a5e46cf;hpb=a250c7807f325c964c7315ad3fb441bc5e8ae39f

diff --git a/configure.in b/configure.in
index 4b4e209..95424f5 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]
 )
@@ -17,9 +17,19 @@ AC_ARG_ENABLE( bos-restricted-mode,
 [  --enable-bos-restricted-mode 	enable bosserver restricted mode which disables certain bosserver functionality],, enable_bos_restricted_mode="no")
 AC_ARG_ENABLE( namei-fileserver,
 [  --enable-namei-fileserver 		force compilation of namei fileserver in preference to inode fileserver],, enable_namei_fileserver="no")
+AC_ARG_ENABLE( fast-restart,
+[  --enable-fast-restart 		enable fast startup of file server without salvaging],, enable_fast_restart="no")
+AC_ARG_ENABLE( bitmap-later,
+[  --enable-bitmap-later 		enable fast startup of file server by not reading bitmap till needed],, enable_bitmap_later="no")
+AC_ARG_WITH(dux-kernel-headers,
+[  --with-dux-kernel-headers=path    	use the kernel headers found at path(optional, defaults to first match in /usr/sys)]
+)
 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
 
@@ -49,26 +59,49 @@ 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 }'`
-		 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"
+                    enable_kernel_module="no"
+                 fi
+		 if test ! -f "$LINUX_KERNEL_PATH/include/linux/autoconf.h"; then
+		     enable_kernel_module="no"
+		 fi
+		 if test "x$enable_kernel_module" = "xno"; then
+		  if test "x$with_linux_kernel_headers" != "x"; then
+		   AC_MSG_ERROR(No usable linux headers found at $LINUX_KERNEL_PATH)
+		   exit 1
+		  else
+		   AC_MSG_WARN(No usable linux headers found at $LINUX_KERNEL_PATH so disabling kernel module)
+		  fi
 		 fi
-		else
-		 AC_MSG_ERROR(No linux headers found at $with_linux_kernel_headers)
-		 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
+		 LINUX_NEED_RHCONFIG
+		 LINUX_WHICH_MODULES
+		 if test "x$ac_cv_linux_func_inode_setattr_returns_int" = "xyes" ; then
+		  AC_DEFINE(INODE_SETATTR_NOT_VOID)
+		 fi
+		 if test "x$ac_cv_linux_fs_struct_inode_has_i_bytes" = "xyes"; then 
+		  AC_DEFINE(STRUCT_INODE_HAS_I_BYTES)
+		 fi
+                :
+		fi
                 ;;
         *-solaris*)
 		MKAFS_OSTYPE=SOLARIS
@@ -89,6 +122,17 @@ case $system in
         *-osf*)
 		MKAFS_OSTYPE=DUX
                 AC_MSG_RESULT(alpha_dux)
+		if test "x$enable_kernel_module" = "xyes"; then
+		 if test "x$with_dux_kernel_headers" != "x"; then
+		   HEADER_RT=`ls ${with_dux_kernel_headers}/rt_preempt.h | head -1 | sed 's,/rt_preempt.h,,;s,/usr/sys/,,'`
+		 else
+ 		   HEADER_RT=`ls /usr/sys/*/rt_preempt.h | head -1 | sed 's,/rt_preempt.h,,;s,/usr/sys/,,'`
+		 fi
+		fi
+		if test "$HEADER_RT" = "*" ; then
+			AC_MSG_ERROR([Need a configured kernel directory])
+		fi
+		AC_SUBST([HEADER_RT])
                 ;;
         *-darwin*)
 		MKAFS_OSTYPE=DARWIN
@@ -111,7 +155,7 @@ else
   if test "$ac_cv_func_socket" = no; then
     for lib in socket inet; do
         if test "$HAVE_SOCKET" != 1; then
-                AC_CHECK_LIB($lib, socket,LIBS="$LIBS -l$lib";HAVE_SOCKET=1;AC_DEFINE(HAVE_SOCKET))
+                AC_CHECK_LIB(${lib}, socket,LIBS="$LIBS -l$lib";HAVE_SOCKET=1;AC_DEFINE(HAVE_SOCKET))
         fi
     done
   fi
@@ -121,7 +165,7 @@ else
   if test "$ac_cv_func_connect" = no; then
     for lib in nsl; do
         if test "$HAVE_CONNECT" != 1; then
-                AC_CHECK_LIB($lib, connect,LIBS="$LIBS -l$lib";HAVE_CONNECT=1;AC_DEFINE(HAVE_CONNECT))
+                AC_CHECK_LIB(${lib}, connect,LIBS="$LIBS -l$lib";HAVE_CONNECT=1;AC_DEFINE(HAVE_CONNECT))
         fi
     done
   fi
@@ -130,7 +174,7 @@ else
   if test "$ac_cv_func_gethostbyname" = no; then
         for lib in dns nsl resolv; do
           if test "$HAVE_GETHOSTBYNAME" != 1; then
-            AC_CHECK_LIB($lib, gethostbyname, LIBS="$LIBS -l$lib";HAVE_GETHOSTBYNAME=1;AC_DEFINE(HAVE_GETHOSTBYNAME))
+            AC_CHECK_LIB(${lib}, gethostbyname, LIBS="$LIBS -l$lib";HAVE_GETHOSTBYNAME=1;AC_DEFINE(HAVE_GETHOSTBYNAME))
           fi
         done    
   fi    
@@ -139,7 +183,7 @@ else
   if test "$ac_cv_func_res_search" = no; then
         for lib in dns nsl resolv; do
           if test "$HAVE_RES_SEARCH" != 1; then
-            AC_CHECK_LIB($lib, res_search, LIBS="$LIBS -l$lib";HAVE_RES_SEARCH=1;AC_DEFINE(HAVE_RES_SEARCH))
+            AC_CHECK_LIB(${lib}, res_search, LIBS="$LIBS -l$lib";HAVE_RES_SEARCH=1;AC_DEFINE(HAVE_RES_SEARCH))
           fi
         done    
 	if test "$HAVE_RES_SEARCH" = 1; then
@@ -163,7 +207,7 @@ if test "x$PTHREAD_LIBS" = xerror; then
         AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
 fi
 if test "x$PTHREAD_LIBS" = xerror; then
-        AC_MSG_ERROR(*** Unable to locate working posix thread library ***)
+        AC_MSG_WARN(*** Unable to locate working posix thread library ***)
 fi
 AC_SUBST(PTHREAD_LIBS)
 
@@ -177,6 +221,15 @@ if test "$enable_insecure" = "yes"; then
 	WITH_INSECURE=YES
 fi
 
+# Fast restart
+if test "$enable_fast_restart" = "yes"; then
+	AC_DEFINE(FAST_RESTART)
+fi
+
+if test "$enable_bitmap_later" = "yes"; then
+	AC_DEFINE(BITMAP_LATER)
+fi
+
 # Should autocompute a default
 if test "x$with_afs_sysname" != "x"; then
 	AFS_SYSNAME="$with_afs_sysname"
@@ -214,7 +267,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)