Breaking the world for a little bit. If anyone is going to continue

working on this branch for the next few days I suggested you work
off of the 0.3.1 tag.  The following changes are fairly extensive
and are designed to make the SPL compatible with all kernels in
the range of 2.6.18-2.6.25.  There were 13 relevant API changes
between these releases and I have added the needed autoconf tests
to check for them.  However, this has not all been tested extensively.
I'll sort of the breakage on Fedora Core 9 and RHEL5 this week.

SPL_AC_TYPE_UINTPTR_T
SPL_AC_TYPE_KMEM_CACHE_T
SPL_AC_KMEM_CACHE_DESTROY_INT
SPL_AC_ATOMIC_PANIC_NOTIFIER
SPL_AC_3ARGS_INIT_WORK
SPL_AC_2ARGS_REGISTER_SYSCTL
SPL_AC_KMEM_CACHE_T
SPL_AC_KMEM_CACHE_CREATE_DTOR
SPL_AC_3ARG_KMEM_CACHE_CREATE_CTOR
SPL_AC_SET_SHRINKER
SPL_AC_PATH_IN_NAMEIDATA
SPL_AC_TASK_CURR
SPL_AC_CTL_UNNUMBERED



git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@119 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c

1 files changed, 17 insertions, 177 deletions

diff --git a/configure.ac b/configure.ac
index 587620158..df210ee52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,187 +28,14 @@ AC_INIT
 
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(spl, 0.3.1)
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([spl_config.h])
 
 AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
-kernelsrc=
-kernelbuild=
-
-AC_DEFUN([SPL_AC_KERNEL], [
-	ver=`uname -r`
-
-	AC_ARG_WITH([linux],
-		AS_HELP_STRING([--with-linux=PATH],
-		[Path to kernel source]),
-		[kernelsrc="$withval"; kernelbuild="$withval"])
-
-	AC_ARG_WITH([linux-obj],
-		AS_HELP_STRING([--with-linux-obj=PATH],
-		[Path to kernel build objects]),
-		[kernelbuild="$withval"])
-
-	AC_MSG_CHECKING([kernel source directory])
-	if test -z "$kernelsrc"; then
-		kernelbuild=
-		sourcelink=/lib/modules/${ver}/source
-		buildlink=/lib/modules/${ver}/build
-
-		if test -e $sourcelink; then
-			kernelsrc=`(cd $sourcelink; /bin/pwd)`
-		fi
-		if test -e $buildlink; then
-			kernelbuild=`(cd $buildlink; /bin/pwd)`
-		fi
-		if test -z "$kernelsrc"; then
-			kernelsrc=$kernelbuild
-		fi
-		if test -z "$kernelsrc" -o -z "$kernelbuild"; then
-			AC_MSG_RESULT([Not found])
-			AC_MSG_ERROR([
-			*** Please specify the location of the kernel source
-			*** with the '--with-kernel=PATH' option])
-		fi
-	fi
-
-	AC_MSG_RESULT([$kernelsrc])
-	AC_MSG_CHECKING([kernel build directory])
-	AC_MSG_RESULT([$kernelbuild])
-
-	AC_MSG_CHECKING([kernel source version])
-	if test -r $kernelbuild/include/linux/version.h && 
-		fgrep -q UTS_RELEASE $kernelbuild/include/linux/version.h; then
-
-		kernsrcver=`(echo "#include <linux/version.h>"; 
-		             echo "kernsrcver=UTS_RELEASE") | 
-	        	     cpp -I $kernelbuild/include |
-		             grep "^kernsrcver=" | cut -d \" -f 2`
-
-	elif test -r $kernelbuild/include/linux/utsrelease.h && 
-		fgrep -q UTS_RELEASE $kernelbuild/include/linux/utsrelease.h; then
-
-		kernsrcver=`(echo "#include <linux/utsrelease.h>"; 
-		             echo "kernsrcver=UTS_RELEASE") | 
-	        	     cpp -I $kernelbuild/include |
-		             grep "^kernsrcver=" | cut -d \" -f 2`
-	fi
-
-	if test -z "$kernsrcver"; then
-		AC_MSG_RESULT([Not found])
-		AC_MSG_ERROR([
-		*** Cannot determine the version of the linux kernel source.
-		*** Please prepare the kernel before running this script])
-	fi
-
-	AC_MSG_RESULT([$kernsrcver])
-	kmoduledir=${INSTALL_MOD_PATH}/lib/modules/$kernsrcver
-	AC_SUBST(kernelsrc)
-	AC_SUBST(kmoduledir)
-])
-
-AC_DEFUN([SPL_AC_DEBUG], [
-	AC_MSG_CHECKING([whether debugging is enabled])
-	AC_ARG_ENABLE( [debug],
-		AS_HELP_STRING([--enable-debug],
-		[Enable generic debug support (default off)]),
-		[ case "$enableval" in
-			yes) spl_ac_debug=yes ;;
-			no) spl_ac_debug=no ;;
-			*) AC_MSG_RESULT([Error!])
-			AC_MSG_ERROR([Bad value "$enableval" for --enable-debug]) ;;
-		esac ]
-	) 
-	if test "$spl_ac_debug" = yes; then
-		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG"
-	else
-		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG"
-		AC_DEFINE([NDEBUG], [1],
-		[Define to 1 to disable debug tracing])
-	fi
-	AC_MSG_RESULT([${spl_ac_debug=no}])
-])
-
-AC_DEFUN([SPL_AC_DEBUG_KMEM], [
-	AC_MSG_CHECKING([whether kmem debugging is enabled])
-	AC_ARG_ENABLE( [debug-kmem],
-		AS_HELP_STRING([--enable-debug-kmem],
-		[Enable kmem debug support (default off)]),
-		[ case "$enableval" in
-			yes) spl_ac_debug=yes ;;
-			no) spl_ac_debug=no ;;
-			*) AC_MSG_RESULT([Error!])
-			AC_MSG_ERROR([Bad value "$enableval" for --enable-debug-kmem]) ;;
-		esac ]
-	) 
-	if test "$spl_ac_debug" = yes; then
-		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KMEM"
-		AC_DEFINE([DEBUG_KMEM], [1],
-		[Define to 1 to enable kmem debugging])
-	fi
-	AC_MSG_RESULT([${spl_ac_debug=no}])
-])
-
-AC_DEFUN([SPL_AC_DEBUG_MUTEX], [
-	AC_MSG_CHECKING([whether mutex debugging is enabled])
-	AC_ARG_ENABLE( [debug-mutex],
-		AS_HELP_STRING([--enable-debug-mutex],
-		[Enable mutex debug support (default off)]),
-		[ case "$enableval" in
-			yes) spl_ac_debug=yes ;;
-			no) spl_ac_debug=no ;;
-			*) AC_MSG_RESULT([Error!])
-			AC_MSG_ERROR([Bad value "$enableval" for --enable-debug-mutex]) ;;
-		esac ]
-	) 
-	if test "$spl_ac_debug" = yes; then
-		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_MUTEX"
-		AC_DEFINE([DEBUG_MUTEX], [1],
-		[Define to 1 to enable mutex debugging])
-	fi
-	AC_MSG_RESULT([${spl_ac_debug=no}])
-])
-
-AC_DEFUN([SPL_AC_DEBUG_KSTAT], [
-	AC_MSG_CHECKING([whether kstat debugging is enabled])
-	AC_ARG_ENABLE( [debug-kstat],
-		AS_HELP_STRING([--enable-debug-kstat],
-		[Enable kstat debug support (default off)]),
-		[ case "$enableval" in
-			yes) spl_ac_debug=yes ;;
-			no) spl_ac_debug=no ;;
-			*) AC_MSG_RESULT([Error!])
-			AC_MSG_ERROR([Bad value "$enableval" for --enable-debug-kstat]) ;;
-		esac ]
-	) 
-	if test "$spl_ac_debug" = yes; then
-		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KSTAT"
-		AC_DEFINE([DEBUG_KSTAT], [1],
-		[Define to 1 to enable kstat debugging])
-	fi
-	AC_MSG_RESULT([${spl_ac_debug=no}])
-])
-
-AC_DEFUN([SPL_AC_DEBUG_CALLB], [
-	AC_MSG_CHECKING([whether callb debugging is enabled])
-	AC_ARG_ENABLE( [debug-callb],
-		AS_HELP_STRING([--enable-debug-callb],
-		[Enable callb debug support (default off)]),
-		[ case "$enableval" in
-			yes) spl_ac_debug=yes ;;
-			no) spl_ac_debug=no ;;
-			*) AC_MSG_RESULT([Error!])
-			AC_MSG_ERROR([Bad value "$enableval" for --enable-debug-callb]) ;;
-		esac ]
-	) 
-	if test "$spl_ac_debug" = yes; then
-		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_CALLB"
-		AC_DEFINE([DEBUG_CALLB], [1],
-		[Define to 1 to enable callb debugging])
-	fi
-	AC_MSG_RESULT([${spl_ac_debug=no}])
-])
+LINUX=
+LINUX_OBJ=
 
 SPL_AC_KERNEL
 SPL_AC_DEBUG
@@ -216,6 +43,19 @@ SPL_AC_DEBUG_KMEM
 SPL_AC_DEBUG_MUTEX
 SPL_AC_DEBUG_KSTAT
 SPL_AC_DEBUG_CALLB
+SPL_AC_TYPE_UINTPTR_T
+SPL_AC_TYPE_KMEM_CACHE_T
+SPL_AC_KMEM_CACHE_DESTROY_INT
+SPL_AC_ATOMIC_PANIC_NOTIFIER
+SPL_AC_3ARGS_INIT_WORK
+SPL_AC_2ARGS_REGISTER_SYSCTL
+SPL_AC_KMEM_CACHE_T
+SPL_AC_KMEM_CACHE_CREATE_DTOR
+SPL_AC_3ARG_KMEM_CACHE_CREATE_CTOR
+SPL_AC_SET_SHRINKER
+SPL_AC_PATH_IN_NAMEIDATA
+SPL_AC_TASK_CURR
+SPL_AC_CTL_UNNUMBERED
 
 TOPDIR=`/bin/pwd`
 
@@ -223,7 +63,7 @@ TOPDIR=`/bin/pwd`
 KERNELMAKE_PARAMS=
 KERNELCPPFLAGS="${KERNELCPPFLAGS} -I$TOPDIR -I$TOPDIR/include"
 
-if test "$kernelbuild" != "$kernelsrc"; then
+if test "${LINUX_OBJ}" != "${LINUX}"; then
 	KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$kernelbuild"
 fi