From 97e441dce905938e8feffedf5d4b1d479a300888 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Wed, 11 Jul 2001 00:40:15 +0000 Subject: [PATCH] configurable-dux-kernel-header-path-20010710 modified slightly to allow selection if more than one directory exists --- configure.in | 14 ++++++++++++++ src/libafs/MakefileProto.DUX.in | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index d5e9863e6..e824c0a7b 100644 --- a/configure.in +++ b/configure.in @@ -21,6 +21,9 @@ 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)] ) @@ -113,6 +116,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 diff --git a/src/libafs/MakefileProto.DUX.in b/src/libafs/MakefileProto.DUX.in index 6f09a4d49..c1abece41 100644 --- a/src/libafs/MakefileProto.DUX.in +++ b/src/libafs/MakefileProto.DUX.in @@ -28,10 +28,11 @@ AFS_OS_NFSOBJS = \ AFS_OS_NONFSOBJS = \ osi_vfsops.o +HEADER_RT = @HEADER_RT@ # System specific build commands and flags KDEFS=-DLANGUAGE_C -G 4 -I/usr/sys/include -I../include \ - -I/usr/sys/${HEADER_RT} -I/usr/sys/BINARY -I/usr/sys/AFS \ + -I/usr/sys/${HEADER_RT} -I/usr/sys/BINARY \ -DDEC3000_500 -DSWAPTYPE=1 -DUERF -DOSF -DCOMPAT_43 -DMACH -DUFS \ -DRT -DKERNEL -D_KERNEL -signed -no_excpt -Wb,-static -Wco,-nofloat \ -Olimit 1000 -D__alpha -Umips -UMIPS -- 2.39.5