[Libsysio-commit] HEAD: libsysio Makefile.am configure.in

[Ruth K. <rk...@us...>]

Update of /cvsroot/libsysio/libsysio
In directory sc8-pr-cvs1:/tmp/cvs-serv16191

Modified Files:
	Makefile.am configure.in 
Log Message:
merge cplant branch into head

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -b -B -p -r1.7 -r1.8
--- Makefile.am	26 Mar 2003 00:00:15 -0000	1.7
+++ Makefile.am	14 Aug 2003 18:39:32 -0000	1.8
@@ -5,7 +5,15 @@ else
 TESTS =
 endif
 
+if WITH_CPLANT_TESTS
+SUBDIRS = $(TESTS)
+else
+if WITH_CPLANT_YOD
+SUBDIRS = src drivers dev
+else
 SUBDIRS = src drivers dev $(TESTS)
+endif
+endif
 
 EXTRA_DIST = Rules.make \
 	include/dev.h include/file.h include/fs.h include/inode.h \
@@ -16,6 +24,7 @@ really-clean: maintainer-clean
 	-rm -rf .deps
 	-rm -f Makefile.in \
 		drivers/native/Makefile.in drivers/incore/Makefile.in \
+		drivers/yod/Makefile.in \
 		drivers/Makefile.in \
 		dev/stdfd/Makefile.in \
 		dev/Makefile.in \

Index: configure.in
===================================================================
RCS file: /cvsroot/libsysio/libsysio/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -b -B -p -r1.6 -r1.7
--- configure.in	25 Jul 2003 14:44:14 -0000	1.6
+++ configure.in	14 Aug 2003 18:39:32 -0000	1.7
@@ -19,21 +19,19 @@ AC_HEADER_STDC
 AC_HEADER_STAT
 AC_HEADER_TIME
 
-AC_ARG_WITH(with_native_driver,
+AC_ARG_WITH(native_driver,
   [ --with-native-driver build native test driver],
-  [	with_native_driver=${withval}
-	case "${withval}" in
+  [	case "${withval}" in
 	 yes) ;;
 	 no) ;;
 	 *) AC_MSG_ERROR(bad value ${withval} for --with-native-driver) ;;
-	esac],
-  [with_native_driver=yes])
+	esac;],
+  [with_native_driver=yes;])
 AM_CONDITIONAL(WITH_NATIVE_DRIVER, test x$with_native_driver = xyes)
 
-AC_ARG_WITH(with_incore_driver,
+AC_ARG_WITH(incore-driver,
   [ --with-incore-driver build incore test driver],
-  [	with_incore_driver=${withval}
-	case "${withval}" in
+  [ 	case "${withval}" in
 	 yes) ;;
 	 no) ;;
 	 *) AC_MSG_ERROR(bad value ${withval} for --with-incore-driver) ;;
@@ -41,10 +39,9 @@ AC_ARG_WITH(with_incore_driver,
   [with_incore_driver=yes])
 AM_CONDITIONAL(WITH_INCORE_DRIVER, test x$with_incore_driver = xyes)
 
-AC_ARG_WITH(with_tests,
+AC_ARG_WITH(tests,
   [ --with-tests build tests],
-  [	with_tests=${withval}
-	case "${withval}" in
+  [	case "${withval}" in
 	 yes) ;;
 	 no) ;;
 	 *) AC_MSG_ERROR(bad value ${withval} for --with-tests) ;;
@@ -54,25 +51,53 @@ AM_CONDITIONAL(WITH_TESTS, test x$with_t
 
 AC_ARG_WITH(automount,
   [ --with-automount=[automount-file-name] with automounts],
-  with_automount=$withval,
-  [with_automount=])
-if test x$with_automount != x; then
-	AUTOMOUNT=-DAUTOMOUNT_FILE_NAME="\\\"$with_automount\\\""
-fi
+  [ if test x${withval} != x; then
+	AUTOMOUNT=-DAUTOMOUNT_FILE_NAME="\\\"${withval}\\\""
+    fi])
 AC_SUBST(AUTOMOUNT)
 
-AC_ARG_WITH(with_stdfd_dev,
+AC_ARG_WITH(stdfd-dev,
   [ --with-stdfd-dev build standard file descriptors pseudo-driver],
-  [	with_stdfd_dev=${withval}
-	case "${withval}" in
-	 yes)
-		;;
+  [	case "${withval}" in
+	 yes) ;;
 	 no) ;;
 	 *) AC_MSG_ERROR(bad value ${withval} for --with-stdfd-dev) ;;
 	esac],
   [with_stdfd_dev=yes])
 AM_CONDITIONAL(WITH_STDFD_DEV, test x$with_stdfd_dev = xyes)
 
+AC_ARG_WITH(cplant_yod,
+   [ --with-cplant-yod build cplant yod I/O driver],
+   [	case "${withval}" in	
+	yes) if test x${with_stdfd_dev} != xyes; then
+		with_stdfd_dev=yes
+		AM_CONDITIONAL(WITH_STDFD_DEV, test x$with_stdfd_dev = xyes)
+	     fi ;;
+	no) ;;
+	*) AC_MSG_ERROR(bad value ${withval} for --with-cplant-yod);;
+	esac],
+    [with_cplant_yod=no])
+AM_CONDITIONAL(WITH_CPLANT_YOD, test x$with_cplant_yod = xyes)
+
+AC_ARG_WITH(cplant_tests,
+   [ --with-cplant-tests=[cplant build path] build libsysio tests for cplant platform],
+   [	case "${withval}" in
+	yes) AC_MSG_ERROR(need path to compiler for --with-cplant-tests);;
+	no)  with_cplant_tests=no;;
+	*) CPLANT_PATH=${withval}
+	   CC=${CPLANT_PATH}/cplant-cc
+	   CCDEPMODE=${CC} 
+	   CPP="${CC} -E"
+	   AC_CHECK_FILE(${CC},
+		[ if test x${with_cplant_yod} != xyes; then
+                	with_cplant_yod=yes
+                	AM_CONDITIONAL(WITH_CPLANT_YOD, test x$with_cplant_yod = xyes)
+             	  fi],
+		[ AC_MSG_ERROR(path not found ${CC} for --with-cplant-tests) ]);;
+	esac],
+    [with_cplant_tests=no])
+AM_CONDITIONAL(WITH_CPLANT_TESTS, test x$with_cplant_tests != xno)
+
 # We keep the original values in `$config_*' and never modify them, so we
 # can write them unchanged into config.make.  Everything else uses
 # $machine, $vendor, and $os, and changes them whenever convenient.
@@ -154,7 +179,8 @@ AC_MSG_RESULT($alpha_linux_env)
 AC_MSG_CHECKING(for 64 bit stat and truncate syscalls)
 AC_TRY_COMPILE([
 #include <sys/stat.h>
-#include <syscall.h>],
+#include <syscall.h>
+extern int syscall();],
 [char path[] = "/";
 int fd = 0;
 struct stat buf;
@@ -174,7 +200,8 @@ fi
 #
 AC_MSG_CHECKING(for fdatasync system call)
 AC_TRY_COMPILE([
-#include <syscall.h>],
+#include <syscall.h>
+extern int syscall();],
 [int fd = 0;
 syscall(SYS_fdatasync, fd);],
 	syscall_fdatasync_exists=yes,
@@ -188,7 +215,8 @@ fi
 #
 AC_MSG_CHECKING(for utime system call)
 AC_TRY_COMPILE([
-#include <syscall.h>],
+#include <syscall.h>
+extern int syscall();],
 [syscall(SYS_utime);],
 	syscall_utime_exists=yes,
 	syscall_utime_exists=no)
@@ -196,7 +224,7 @@ AC_MSG_RESULT($syscall_utime_exists)
 if test x$syscall_utime_exists = xno; then
 	AC_DEFINE(USE_NATIVE_UTIME)
 fi
-# Check for SYS_utime
+# Check for __st_ino 
 #
 AC_MSG_CHECKING(for __st_ino)
 AC_TRY_COMPILE([
@@ -332,6 +360,7 @@ AC_OUTPUT(
 	drivers/Makefile
 	drivers/native/Makefile
 	drivers/incore/Makefile
+	drivers/yod/Makefile
 	dev/Makefile
 	dev/stdfd/Makefile
 	tests/Makefile)