[Libsysio-commit] b_lustre: libsysio README configure.in

[Mei <me...@us...>]

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

Modified Files:
      Tag: b_lustre
	README configure.in 
Log Message:
merge HEAD into b_lustre, some fixes



Index: README
===================================================================
RCS file: /cvsroot/libsysio/libsysio/README,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -w -b -B -p -r1.2 -r1.2.10.1
--- README	7 Mar 2003 03:31:35 -0000	1.2
+++ README	1 Nov 2003 03:08:21 -0000	1.2.10.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:
 
@@ -53,3 +53,14 @@ is required. They are not on a timer, un
 one for them. They just disappear as resource is needed elsewhere. As they
 were automatically mounted to begin with, they should re-establish as needed,
 transparently.
+
+REDSTORM
+--------
+
+The following works for me:
+
+#!/bin/sh
+
+export CFLAGS="-DREDSTORM -nostdinc -isystem /home/lee/REDSTORM/catamount/computeincs/i386 -isystem /home/lee/REDSTORM/catamount/include -g -W -Wall -ansi"
+
+sh configure --with-autmount=".mount" --with-native=yes --with-incore-yes --with-stdfd=yes --with-tests=yes

Index: configure.in
===================================================================
RCS file: /cvsroot/libsysio/libsysio/configure.in,v
retrieving revision 1.5.4.3
retrieving revision 1.5.4.4
diff -u -w -b -B -p -r1.5.4.3 -r1.5.4.4
--- configure.in	8 Sep 2003 03:52:28 -0000	1.5.4.3
+++ configure.in	1 Nov 2003 03:08:21 -0000	1.5.4.4
@@ -3,7 +3,7 @@ AC_INIT(libsysio, 0.1)
 AC_CANONICAL_HOST
 
 case "$host_os" in
-  linux-gnu)
+  linux*)
 	;;
   cygwin)
 	;;
@@ -22,7 +22,7 @@ AC_HEADER_STAT
 AC_HEADER_TIME
 
 AC_ARG_WITH(native_driver,
-  [ --with-native-driver build native test driver],
+  AC_HELP_STRING([--with-native-driver],[build native test driver]),
   [	case "${withval}" in
 	 yes) ;;
 	 no) ;;
@@ -32,7 +32,7 @@ AC_ARG_WITH(native_driver,
 AM_CONDITIONAL(WITH_NATIVE_DRIVER, test x$with_native_driver = xyes)
 
 AC_ARG_WITH(incore-driver,
-  [ --with-incore-driver build incore test driver],
+  AC_HELP_STRING([--with-incore-driver],[build incore test driver]),
   [ 	case "${withval}" in
 	 yes) ;;
 	 no) ;;
@@ -42,7 +42,7 @@ AC_ARG_WITH(incore-driver,
 AM_CONDITIONAL(WITH_INCORE_DRIVER, test x$with_incore_driver = xyes)
 
 AC_ARG_WITH(tests,
-  [ --with-tests build tests],
+  AC_HELP_STRING([--with-tests],[build tests]),
   [	case "${withval}" in
 	 yes) ;;
 	 no) ;;
@@ -52,14 +52,18 @@ AC_ARG_WITH(tests,
 AM_CONDITIONAL(WITH_TESTS, test x$with_tests = xyes)
 
 AC_ARG_WITH(automount,
-  [ --with-automount=[automount-file-name] with automounts],
-  [ if test x${withval} != x; then
+  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],
+  AC_HELP_STRING([--with-stdfd-dev],
+    [build standard file descriptors pseudo-driver]),
   [	case "${withval}" in
 	 yes) ;;
 	 no) ;;
@@ -69,7 +73,7 @@ AC_ARG_WITH(stdfd-dev,
 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],
+   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
@@ -82,12 +86,12 @@ AC_ARG_WITH(cplant_yod,
 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],
+   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
+	*) CC=${withval}
 	   CCDEPMODE=${CC} 
 	   CPP="${CC} -E"
 	   AC_CHECK_FILE(${CC},
@@ -160,7 +164,7 @@ AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>], [
-struct stat64 st64; printf("%u\n", sizeof(struct stat64));],
+struct stat64 st64;],
 sysio_largefile64_source_required=no,
 sysio_largefile64_source_required=maybe)
 if test x$sysio_largefile64_source_required = xmaybe; then
@@ -169,7 +173,7 @@ if test x$sysio_largefile64_source_requi
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>], [
-int i; i = 0;],
+struct stat64 st64;],
 		       sysio_largefile64_source_required=yes,
 		       sysio_largefile64_source_required=no)
 fi
@@ -182,12 +186,13 @@ fi
 # 
 AC_MSG_CHECKING(for alpha linux)
 alpha_linux_env=no
-if test ${machine:0:5} = alpha && \
-   test ${os:0:5} = linux; then 
+if test `expr ${machine} : "alpha"` = 5 && \
+   test `expr ${os} : "linux"` = 5; then
 	alpha_linux_env=yes
 	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
 # 
@@ -214,6 +219,11 @@ fi
 # Check for fdatasync syscall
 #
 AC_MSG_CHECKING(for fdatasync system call)
+if test x$alpha_linux_env == xyes; then
+	_syscallnum=SYS_osf_fdatasync
+else
+	_syscallnum=SYS_fdatasync
+fi
 AC_TRY_COMPILE([
 #include <syscall.h>
 extern int syscall();],
@@ -222,8 +232,8 @@ syscall(SYS_fdatasync, fd);],
 	syscall_fdatasync_exists=yes,
 	syscall_fdatasync_exists=no)
 AC_MSG_RESULT($syscall_fdatasync_exists)
-if test x$syscall_fdatasync_exists = xno; then
-	AC_DEFINE(USE_NATIVE_FDATASYNC)
+if test x$syscall_fdatasync_exists = xyes; then
+	AC_DEFINE_UNQUOTED(NATIVE_FDATASYNC, $_syscallnum)
 fi
 
 # Check for SYS_utime