Update of /cvsroot/libsysio/libsysio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9381
Modified Files:
Tag: strided-io
ChangeLog Makefile.am Rules.make configure.in
Log Message:
Merged in changes from HEAD.
Added a little note in ChangeLog about the internal interface change.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/libsysio/libsysio/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.3.16.1
diff -u -w -b -B -p -r1.3 -r1.3.16.1
--- ChangeLog 24 Mar 2003 22:06:38 -0000 1.3
+++ ChangeLog 26 Jan 2004 16:27:46 -0000 1.3.16.1
@@ -23,3 +23,9 @@ and other annoying little chicken-and-th
*Added support for accessing the pre-opened standard file descriptors 0, 1,
and 2 via the stdfd device driver (major number 0, minor 0, 1, and 2).
+
+---
+Lee -- Mon Jan 26 11:26:14 EST 2004
+
+*Altered the internal interface to pass the xtvec (see .../include/xtio.h) in
+order to support strided-io.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v
retrieving revision 1.9.6.1
retrieving revision 1.9.6.2
diff -u -w -b -B -p -r1.9.6.1 -r1.9.6.2
--- Makefile.am 23 Jan 2004 14:25:35 -0000 1.9.6.1
+++ Makefile.am 26 Jan 2004 16:27:46 -0000 1.9.6.2
@@ -13,6 +13,7 @@ include $(top_srcdir)/dev/stdfd/module.m
include $(top_srcdir)/drivers/incore/module.mk
include $(top_srcdir)/drivers/native/module.mk
include $(top_srcdir)/drivers/yod/module.mk
+include $(top_srcdir)/drivers/sockets/module.mk
lib_LIBRARIES = ${LIBBUILD_DIR}/libsysio.a
@@ -34,6 +35,12 @@ else
OPTIONAL_NATIVE_SRCS =
endif
+if WITH_SOCKETS_DRIVER
+OPTIONAL_SOCKETS_SRCS = $(SOCKETS_SRCS)
+else
+OPTIONAL_SOCKETS_SRCS =
+endif
+
if WITH_CPLANT_YOD
OPTIONAL_YOD_SRCS = $(YOD_SRCS)
else
@@ -44,6 +51,7 @@ __LIBBUILD_DIR__libsysio_a_SOURCES = \
$(SRCDIR_SRCS) \
$(OPTIONAL_STDFD_SRCS) \
$(OPTIONAL_INCORE_SRCS) \
+ $(OPTIONAL_SOCKETS_SRCS) \
$(OPTIONAL_NATIVE_SRCS) \
$(OPTIONAL_YOD_SRCS)
@@ -59,7 +67,7 @@ include $(top_srcdir)/Rules.make
EXTRA_DIST = Rules.make $(TESTS_EXTRA) $(SRCDIR_EXTRA) \
$(INCLUDE_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \
- $(NATIVE_EXTRA) $(YOD_EXTRA)
+ $(SOCKETS_EXTRA) $(NATIVE_EXTRA) $(YOD_EXTRA)
AM_CPPFLAGS += ${YOD_DRIVER_FLAGS}
Index: Rules.make
===================================================================
RCS file: /cvsroot/libsysio/libsysio/Rules.make,v
retrieving revision 1.4
retrieving revision 1.4.16.1
diff -u -w -b -B -p -r1.4 -r1.4.16.1
--- Rules.make 24 Mar 2003 22:06:38 -0000 1.4
+++ Rules.make 26 Jan 2004 16:27:46 -0000 1.4.16.1
@@ -5,6 +5,14 @@ else
STFD_DEV_CPPFLAGS =
endif
+if WITH_SOCKETS_DRIVER
+SOCKETS_CPPFLAGS=-DWITH_SOCKETS=1
+else
+SOCKETS_CPPFLAGS=
+endif
+
DEV_CPPFLAGS = $(STDFD_DEV_CPPFLAGS)
-AM_CPPFLAGS = $(AUTOMOUNT) $(DEV_CPPFLAGS) -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+ $(AUTOMOUNT) $(DEV_CPPFLAGS) $(SOCKETS_CPPFLAGS) \
+ -I$(top_srcdir)/include
Index: configure.in
===================================================================
RCS file: /cvsroot/libsysio/libsysio/configure.in,v
retrieving revision 1.12.6.1
retrieving revision 1.12.6.2
diff -u -w -b -B -p -r1.12.6.1 -r1.12.6.2
--- configure.in 23 Jan 2004 14:25:35 -0000 1.12.6.1
+++ configure.in 26 Jan 2004 16:27:46 -0000 1.12.6.2
@@ -122,6 +122,17 @@ AC_ARG_WITH(cplant_tests,
[with_cplant_tests=no])
AM_CONDITIONAL(WITH_CPLANT_TESTS, test x$with_cplant_tests != xno)
+AC_ARG_WITH(sockets,
+ AC_HELP_STRING([--with-sockets],
+ [build sockets interface driver (EXPERIMENTAL)]),
+ [ case "${withval}" in
+ yes) ;;
+ no) ;;
+ *) AC_MSG_ERROR(bad value ${withval} for --with-sockets) ;;
+ esac],
+ [with_sockets=no])
+AM_CONDITIONAL(WITH_SOCKETS_DRIVER, test x$with_sockets = xyes)
+
# 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.
|