[Libsysio-commit] namespace_assembly: libsysio Makefile.am Rules.make configure.in

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15431

Modified Files:
      Tag: namespace_assembly
	Makefile.am Rules.make configure.in 
Log Message:


Bring in changes from the HEAD.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -w -b -B -p -r1.9 -r1.9.2.1
--- Makefile.am	16 Dec 2003 15:43:14 -0000	1.9
+++ Makefile.am	28 Jan 2004 13:16:55 -0000	1.9.2.1
@@ -13,17 +13,61 @@ 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
 
-__LIBBUILD_DIR__libsysio_a_SOURCES = $(SRCDIR_SRCS) $(STDFD_SRCS) \
-	$(INCORE_SRCS) $(NATIVE_SRCS) $(YOD_SRCS)
+if WITH_STDFD_DEV
+OPTIONAL_STDFD_SRCS = $(STDFD_SRCS)
+else
+OPTIONAL_STDFD_SRCS =
+endif
+
+if WITH_INCORE_DRIVER
+OPTIONAL_INCORE_SRCS = $(INCORE_SRCS)
+else
+OPTIONAL_INCORE_SRCS =
+endif
+
+if WITH_NATIVE_DRIVER
+OPTIONAL_NATIVE_SRCS = $(NATIVE_SRCS)
+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
+OPTIONAL_YOD_SRCS =
+endif
+
+__LIBBUILD_DIR__libsysio_a_SOURCES = \
+	$(SRCDIR_SRCS) \
+	$(OPTIONAL_STDFD_SRCS) \
+	$(OPTIONAL_INCORE_SRCS) \
+	$(OPTIONAL_SOCKETS_SRCS) \
+	$(OPTIONAL_NATIVE_SRCS) \
+	$(OPTIONAL_YOD_SRCS)
+
+#
+# Cygwin related? Configure seems to do this for us when appropriate. Why
+# was this here?
+#
+# Commented out by Lee; Wed Jan 21 08:21:33 EST 2004
+#
+#__LIBBUILD_DIR__libsysio_a_CFLAGS = -fPIC
 
 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.12.1
diff -u -w -b -B -p -r1.4 -r1.4.12.1
--- Rules.make	24 Mar 2003 22:06:38 -0000	1.4
+++ Rules.make	28 Jan 2004 13:16:55 -0000	1.4.12.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
retrieving revision 1.12.2.1
diff -u -w -b -B -p -r1.12 -r1.12.2.1
--- configure.in	16 Dec 2003 15:43:14 -0000	1.12
+++ configure.in	28 Jan 2004 13:16:55 -0000	1.12.2.1
@@ -32,7 +32,7 @@ AC_ARG_WITH(lib-dir,
         esac;],
   [ LIBBUILD_DIR=`pwd`/lib;
     test -d ${LIBBUILD_DIR} || mkdir ${LIBBUILD_DIR} || have_lib_dir=no;])
-if test x${have_lib_dir} == xyes; then
+if test x${have_lib_dir} = xyes; then
   echo "Using sysio library directory ${LIBBUILD_DIR}"
 else
   AC_MSG_ERROR(Need writeable path to sysio library directory ${LIBBUILD_DIR})
@@ -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.
@@ -224,7 +235,7 @@ fi
 # Check for fdatasync syscall
 #
 AC_MSG_CHECKING(for fdatasync system call)
-if test x$alpha_linux_env == xyes; then
+if test x$alpha_linux_env = xyes; then
 	_syscallnum=SYS_osf_fdatasync
 else
 	_syscallnum=SYS_fdatasync