diff -r 148ac5ef18ae -r e85e3143dc8d configure.ac --- a/configure.ac Mon Sep 25 12:11:05 2006 +0000 +++ b/configure.ac Mon Sep 25 14:13:23 2006 +0000 @@ -14,27 +14,42 @@ # Linux sources #------------------------------------------------------------------------------ -AC_ARG_WITH([linux-dir], +AC_ARG_WITH([linux], AC_HELP_STRING( - [--with-linux-dir=], - [Linux source directory @<:@/lib/modules//build@:>@]), + [--with-linux=], + [Linux kernel version @<:@running kernel@:>@] + ), [ ], - [ - modulesdir=/lib/modules/`uname -r` - withval=${modulesdir}/build - ]) + [version=`uname -r`] +) -AC_MSG_CHECKING([for Linux source tree]) - -if test \! -r ${withval}/Makefile; then +AC_MSG_CHECKING([for Linux kernel]) +modulesdir=/lib/modules/${version} +if test \! -d ${modulesdir} || test \! -d ${modulesdir}/build; then echo - AC_MSG_ERROR([No Linux kernel tree in $withval]) + AC_MSG_ERROR([Invalid modules directory ${modulesdir}]) +fi +sourcedir=`cd ${modulesdir}/build && pwd -P` +if test \! -r ${sourcedir}/Makefile; then + echo + AC_MSG_ERROR([No Linux kernel tree in $sourcedir]) fi -AC_SUBST(LINUX_DIR,[$withval]) +AC_SUBST(LINUX_KERNEL_VERSION,[$version]) +AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir]) AC_SUBST(LINUX_MODULES_DIR,[$modulesdir]) -AC_MSG_RESULT($LINUX_DIR) +AC_MSG_RESULT($LINUX_KERNEL_VERSION) + +#------------------------------------------------------------------------------ +# Depmod +#------------------------------------------------------------------------------ + +AC_PATH_PROG([DEPMOD], [depmod],, [$PATH:/sbin:/usr/sbin:/usr/local/sbin]) + +if test -z "$DEPMOD"; then + AC_MSG_WARN([depmod was not found!]); +fi #------------------------------------------------------------------------------