[Libsysio-commit] RedStorm_merge: libsysio Makefile.am README Rules.make configure.in
Brought to you by:
lward
Menu
▾
▴
[Libsysio-commit] RedStorm_merge: libsysio Makefile.am README Rules.make configure.in
|
From: Sonja T. <so...@us...> - 2003-10-09 15:04:17
|
Update of /cvsroot/libsysio/libsysio
In directory sc8-pr-cvs1:/tmp/cvs-serv7240
Modified Files:
Tag: RedStorm_merge
Makefile.am README Rules.make configure.in
Log Message:
Merging redstorm changes
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.7.10.1
diff -u -w -b -B -p -r1.7 -r1.7.10.1
--- Makefile.am 26 Mar 2003 00:00:15 -0000 1.7
+++ Makefile.am 9 Oct 2003 15:04:08 -0000 1.7.10.1
@@ -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/redstorm/Makefile.in \
drivers/Makefile.in \
dev/stdfd/Makefile.in \
dev/Makefile.in \
Index: README
===================================================================
RCS file: /cvsroot/libsysio/libsysio/README,v
retrieving revision 1.2.12.2
retrieving revision 1.2.12.2.2.1
diff -u -w -b -B -p -r1.2.12.2 -r1.2.12.2.2.1
--- README 27 May 2003 13:44:30 -0000 1.2.12.2
+++ README 9 Oct 2003 15:04:08 -0000 1.2.12.2.2.1
@@ -17,8 +17,8 @@ Option --with-tests=yes will cause the t
to be enabled. This is set by default; Use "no" to disable.
Option --with-automount=<automount-file-name> will cause automount support
-to be included. Normally, this should be set to ".mount", matching the
-documentation.
+to be included. If <automount-file-name> is not supplied, a default value
+of ".mount" will be used, matching the Lustre documentation.
To build:
Index: Rules.make
===================================================================
RCS file: /cvsroot/libsysio/libsysio/Rules.make,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -w -b -B -p -r1.4 -r1.4.2.1
--- Rules.make 24 Mar 2003 22:06:38 -0000 1.4
+++ Rules.make 9 Oct 2003 15:04:08 -0000 1.4.2.1
@@ -5,6 +5,12 @@ else
STFD_DEV_CPPFLAGS =
endif
+if WITH_REDSTORM_BUILD
+REDSTORM_CFLAGS =-DREDSTORM
+else
+REDSTORM_CFLAGS =
+endif
+
DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS)
-AM_CPPFLAGS = $(AUTOMOUNT) $(DEV_CPPFLAGS) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(AUTOMOUNT) $(DEV_CPPFLAGS) $(REDSTORM_CFLAGS) -I$(top_srcdir)/include
Index: configure.in
===================================================================
RCS file: /cvsroot/libsysio/libsysio/configure.in,v
retrieving revision 1.5.6.4
retrieving revision 1.5.6.4.2.1
diff -u -w -b -B -p -r1.5.6.4 -r1.5.6.4.2.1
--- configure.in 29 Jul 2003 20:17:22 -0000 1.5.6.4
+++ configure.in 9 Oct 2003 15:04:08 -0000 1.5.6.4.2.1
@@ -3,7 +3,7 @@ AC_INIT(libsysio, 0.1)
AC_CANONICAL_HOST
case "$host_os" in
- linux-gnu)
+ linux*)
;;
*)
AC_MSG_WARN('***' ${host_os}: Unsupported OS target)
@@ -20,20 +20,18 @@ AC_HEADER_STAT
AC_HEADER_TIME
AC_ARG_WITH(native_driver,
- [ --with-native-driver build native test driver],
- [ with_native_driver=${withval}
- case "${withval}" in
+ AC_HELP_STRING([--with-native-driver],[build native test driver]),
+ [ 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(incore_driver,
- [ --with-incore-driver build incore test driver],
- [ with_incore_driver=${withval}
- case "${withval}" in
+AC_ARG_WITH(incore-driver,
+ AC_HELP_STRING([--with-incore-driver],[build incore test driver]),
+ [ case "${withval}" in
yes) ;;
no) ;;
*) AC_MSG_ERROR(bad value ${withval} for --with-incore-driver) ;;
@@ -41,10 +39,19 @@ AC_ARG_WITH(incore_driver,
[with_incore_driver=yes])
AM_CONDITIONAL(WITH_INCORE_DRIVER, test x$with_incore_driver = xyes)
+AC_ARG_WITH(redstorm-build,
+ AC_HELP_STRING([--with-redstorm-build],[build for RedStorm compute nodes]),
+ [ case "${withval}" in
+ yes) ;;
+ no) ;;
+ *) AC_MSG_ERROR(bad value ${withval} for --redstorm-build) ;;
+ esac],
+ [redstorm_build=yes])
+AM_CONDITIONAL(WITH_REDSTORM_BUILD, test x$with_redstorm_build = xyes)
+
AC_ARG_WITH(tests,
- [ --with-tests build tests],
- [ with_tests=${withval}
- case "${withval}" in
+ AC_HELP_STRING([--with-tests],[build tests]),
+ [ case "${withval}" in
yes) ;;
no) ;;
*) AC_MSG_ERROR(bad value ${withval} for --with-tests) ;;
@@ -53,26 +60,59 @@ AC_ARG_WITH(tests,
AM_CONDITIONAL(WITH_TESTS, test x$with_tests = xyes)
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
+ AC_HELP_STRING([--with-automount@<:@=<automount-file-name>@:>@],
+ [with automounts @<:@<automount-file-name>=.mount@:>@]),
+ [ if test x${withval} = xyes; then
+ AUTOMOUNT=-DAUTOMOUNT_FILE_NAME="\\\".mount\\\""
+ elif test x${withval} != x; then
+ AUTOMOUNT=-DAUTOMOUNT_FILE_NAME="\\\"${withval}\\\""
+ fi])
AC_SUBST(AUTOMOUNT)
-AC_ARG_WITH(stdfd_dev,
- [ --with-stdfd-dev build standard file descriptors pseudo-driver],
- [ with_stdfd_dev=${withval}
- case "${withval}" in
- yes)
- ;;
+AC_ARG_WITH(stdfd-dev,
+ AC_HELP_STRING([--with-stdfd-dev],
+ [build standard file descriptors pseudo-driver]),
+ [ 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,
+ AC_HELP_STRING([--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,
+ AC_HELP_STRING([--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.
@@ -148,13 +188,15 @@ if test ${machine:0:5} = alpha && \
AC_DEFINE(ALPHA_LINUX)
fi
AC_MSG_RESULT($alpha_linux_env)
+AM_CONDITIONAL(TEST_ALPHA_ARG, test x$alpha_linux_env = xyes)
# check for 64 bit stat, fstat, truncate, ftruncate syscalls
#
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;
@@ -179,8 +221,10 @@ else
_syscallnum=SYS_fdatasync
fi
AC_TRY_COMPILE([
-#include <syscall.h>], [
-syscall($_syscallnum, 0);],
+#include <syscall.h>
+extern int syscall();],
+[int fd = 0;
+syscall(SYS_fdatasync, fd);],
syscall_fdatasync_exists=yes,
syscall_fdatasync_exists=no)
AC_MSG_RESULT($syscall_fdatasync_exists)
@@ -192,7 +236,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)
@@ -200,7 +245,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([
@@ -213,6 +258,20 @@ AC_MSG_RESULT($have__st_ino)
if test x$have__st_ino = xyes; then
AC_DEFINE(HAVE__ST_INO)
fi
+
+# Check for getdents64 call
+AC_MSG_CHECKING(for getdents64 system call)
+AC_TRY_COMPILE([
+#include <syscall.h>],
+[
+ syscall(SYS_getdents64, 0, (char *)0, 0);],
+ syscall_getdents64_exists=yes,
+ syscall_getdents64_exists=no)
+AC_MSG_RESULT($syscall_getdents64_exists)
+if test x$syscall_getdents64_exists = xno; then
+ AC_DEFINE(USE_NATURAL_GETDENTS)
+fi
+
# Check for st_gen
#
AC_MSG_CHECKING(for st_gen)
@@ -227,18 +286,18 @@ if test x$have_st_gen = xyes; then
AC_DEFINE(HAVE_GENERATION)
fi
-# Check for getdents64 call
+# Check for st_gen
#
-AC_MSG_CHECKING(for getdents64 system call)
+AC_MSG_CHECKING(for st_gen)
AC_TRY_COMPILE([
-#include <syscall.h>],
-[
- syscall(SYS_getdents64, 0, (char *)0, 0);],
- syscall_getdents64_exists=yes,
- syscall_getdents64_exists=no)
- AC_MSG_RESULT($syscall_getdents64_exists)
- if test x$syscall_getdents64_exists = xno; then
- AC_DEFINE(USE_NATURAL_GETDENTS)
+#include <sys/stat.h>],
+[struct stat st;
+st.st_gen = 0;],
+ have_st_gen=yes,
+ have_st_gen=no)
+AC_MSG_RESULT($have_st_gen)
+if test x$have_st_gen = xyes; then
+ AC_DEFINE(HAVE_GENERATION)
fi
AC_MSG_CHECKING(whether .text pseudo-op must be used)
@@ -349,7 +408,9 @@ AC_OUTPUT(
src/Makefile
drivers/Makefile
drivers/native/Makefile
+ drivers/redstorm/Makefile
drivers/incore/Makefile
+ drivers/yod/Makefile
dev/Makefile
dev/stdfd/Makefile
tests/Makefile)
|
