From 636bd218106febc3a476ce3118f21d6b32b432b1 Mon Sep 17 00:00:00 2001
From: crunchy <crunchy>
Date: Sat, 12 Oct 2002 21:18:13 +0000
Subject: new check for kernel headers + some updates

---
 ChangeLog          |  3 +++
 TODO               |  8 ++++----
 configure.in       | 27 +++++++++++++++++++++------
 kernel/Makefile.am |  2 +-
 mpio.spec.in       |  3 ++-
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3148cf6..22c9aeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-10-12  Andreas Buesching  <crunchy@tzi.de>
 
+	* configure.in: changed version to 0.6.0 for the next release;
+	add check for a usable path to the kernel header files
+
 	* mpiosh/global.c (commands): removed commands 'put', 'get', 'del'
 	and 'exit' and add these to the alias lists of 'mput', 'mget',
 	'mdel' and 'quit'. Also add some more aliases to some other
diff --git a/TODO b/TODO
index 21e18d8..9e1b87a 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.14 2002/09/14 09:55:31 crunchy Exp $
+$Id: TODO,v 1.15 2002/10/12 21:18:13 crunchy Exp $
 
 * Kernel Module
   - the MPIO can no multitasking, so:
@@ -31,11 +31,11 @@ $Id: TODO,v 1.14 2002/09/14 09:55:31 crunchy Exp $
 * mpiosh
   - more completion functions
     + command completion [DONE]
-    + correct completion of filenames (quoting)
-    + command option completion
+    + correct completion of filenames (quoting) [DONE]
+    + command option completion [partly DONE]
   - handle regexps in command arguments [DONE]
   - use indices for files as possible arguments for put/get
-  - use shell-like regular expressions
+  - use shell-like regular expressions [DONE]
   - command separator like ';' [DONE]
   - using stdin for reading command sequences [DONE]
   - fill: uses current local directory to fill the current memory card
diff --git a/configure.in b/configure.in
index 51d14e2..3af68e4 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ dnl AM_CONFIG_HEADER(src/config.h)
 AC_CANONICAL_SYSTEM()
 AC_MSG_RESULT(Building for a ${host} host.)
 
-AM_INIT_AUTOMAKE(mpio, 0.5.0)
+AM_INIT_AUTOMAKE(mpio, 0.6.0)
 
 dnl Checks for programs.
 
@@ -14,6 +14,11 @@ AC_PROG_MAKE_SET
 AC_PROG_CC
 AM_PROG_LIBTOOL
 
+dnl Checks for header files.
+
+AC_CHECK_HEADER(getopt.h,HAVE_GETOPT_H=1,HAVE_GETOPT_H=0)
+AC_SUBST(HAVE_GETOPT_H)
+
 dnl check for kernel version
 kernel_version=`uname -r 2>&1`
 echo -n "checking for kernel version ... "
@@ -26,7 +31,7 @@ echo $kernel_version
 if test "$_k_verc_fail" ; then
   echo "  Your kernel version is to old."
   echo "  Please update your system to a kernel version of 2.2.x or higher."
-  AC_ERROR("too old")
+  AC_ERROR(too old)
 fi
 
 MODULE_PATH="/lib/modules/${kernel_version}"
@@ -39,14 +44,24 @@ else
 fi
 
 AC_MSG_RESULT(Using module path ${MODULE_PATH}.)
-
 AC_SUBST(MODULE_PATH)
 AC_SUBST(SPEC_PATH)
 
-dnl Checks for header files.
+KERNEL_INCLUDE=
+if test -d "/usr/src/linux/include"; then
+    KERNEL_INCLUDE="/usr/src/linux/include"
+elif test -d "/usr/src/linux-2.4/include"; then
+    KERNEL_INCLUDE="/usr/src/linux-2.4/include"
+elif test -d "/usr/include/linux"; then
+    KERNEL_INCLUDE="/usr/include/linux"
+fi
 
-AC_CHECK_HEADER(getopt.h,HAVE_GETOPT_H=1,HAVE_GETOPT_H=0)
-AC_SUBST(HAVE_GETOPT_H)
+if test -z ${KERNEL_INCLUDE}; then
+    AC_ERROR(could not find directory of kernel include files)
+else
+    AC_MSG_RESULT(Using kernel includes from ${KERNEL_INCLUDE})
+fi
+AC_SUBST(KERNEL_INCLUDE)
 
 dnl ------------------------------------------------------------
 
diff --git a/kernel/Makefile.am b/kernel/Makefile.am
index 89b9980..27193b6 100644
--- a/kernel/Makefile.am
+++ b/kernel/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES=-I/usr/src/linux/include
+INCLUDES=-I@KERNEL_INCLUDE@
 KCFLAGS=-D__KERNEL__ -I$(INCLUDE) -Wall -Wstrict-prototypes -O2 \
 	-fomit-frame-pointer -pipe -DMODULE
 
diff --git a/mpio.spec.in b/mpio.spec.in
index b363e48..a013347 100644
--- a/mpio.spec.in
+++ b/mpio.spec.in
@@ -1,5 +1,6 @@
+# -*- rpm-spec -*-
 %define version @VERSION@
-%define release 2
+%define release 1
 %define name    mpio
 
 Version: %version
-- 
cgit v1.2.3