ChangeLogTag: Fri Jul 23 11:35:31 1999 David L. Levine <levine@cs.wustl.edu>

4 files changed, 65 insertions, 28 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 7a617260bdd..51e6193fbf0 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,12 @@
+Fri Jul 23 11:35:31 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * examples/Connection/non_blocking/tests_lsock_{acceptor,
+          connector.cpp}: disabled if ACE_LACKS_UNIX_DOMAIN_SOCKETS.
+          Thanks to Alain Magloire <alain@qnx.com> for reporting this.
+
+        * examples/Connection/non_blocking/Makefile: removed unneeded
+          LIBS (=$(ACELIB)) and BUILD macro definitions.
+
 Fri Jul 23 10:07:05 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * include/makeinclude/platform_qnx_neutrino.GNU: added
diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile
index 7ed9f058f47..a28a0771103 100644
--- a/examples/Connection/non_blocking/Makefile
+++ b/examples/Connection/non_blocking/Makefile
@@ -1,60 +1,57 @@
 #----------------------------------------------------------------------------
-#	$Id$
+#       $Id$
 #
-#	Makefile for the Connection pattern tests
+#       Makefile for the Connection pattern tests
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Local macros
+#       Local macros
 #----------------------------------------------------------------------------
 
-LIB   	= libConn.a
-SHLIB 	= libConn.$(SOEXT)
+LIB     = libConn.a
+SHLIB   = libConn.$(SOEXT)
 
-BIN   	= test_sock_connector \
+BIN     = test_sock_connector \
           test_sock_acceptor \
-	  test_lsock_connector \
+          test_lsock_connector \
           test_lsock_acceptor \
-	  test_tli_connector \
-	  test_tli_acceptor \
-	  test_spipe_connector \
-	  test_spipe_acceptor
+          test_tli_connector \
+          test_tli_acceptor \
+          test_spipe_connector \
+          test_spipe_acceptor
 
-PSRC   	= $(addsuffix .cpp,$(BIN))
+PSRC    = $(addsuffix .cpp,$(BIN))
 
-LSRC  	= CPP-connector.cpp \
+LSRC    = CPP-connector.cpp \
           CPP-acceptor.cpp
 
-LDLIBS 	= -lConn
-LIBS   += $(ACELIB)
-
-BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
+LDLIBS  = -lConn
 
 #----------------------------------------------------------------------------
-#	Include macros and targets
+#       Include macros and targets
 #----------------------------------------------------------------------------
 
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # To build multiple executables in the same directory on AIX, it works
 # best to wipe out any previously-created tempinc directory.
 # The compiler/linker isn't too smart about instantiating templates...
 ifdef TEMPINCDIR
-COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
+  COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
 endif
 
 #----------------------------------------------------------------------------
-#	Local targets
+#       Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#	Dependencies
+#       Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
diff --git a/examples/Connection/non_blocking/test_lsock_acceptor.cpp b/examples/Connection/non_blocking/test_lsock_acceptor.cpp
index 0b94d117a3b..3f11ab907b5 100644
--- a/examples/Connection/non_blocking/test_lsock_acceptor.cpp
+++ b/examples/Connection/non_blocking/test_lsock_acceptor.cpp
@@ -3,6 +3,20 @@
 // ACE_LSOCK Server.
 
 #include "ace/LSOCK_Acceptor.h"
+
+#if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+int
+main (int, char *argv[])
+{
+  ACE_ERROR_RETURN ((LM_INFO,
+                     ASYS_TEXT ("%s: not supported with ")
+                     ASYS_TEXT ("ACE_LACKS_UNIX_DOMAIN_SOCKETS\n"),
+                     argv[0]),
+                     -1);
+}
+
+#else  /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+
 #include "ace/UNIX_Addr.h"
 #include "CPP-acceptor.h"
 
@@ -42,3 +56,4 @@ template class Svc_Handler<ACE_LSOCK_STREAM>;
 #pragma instantiate Svc_Handler<ACE_LSOCK_STREAM>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#endif /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/examples/Connection/non_blocking/test_lsock_connector.cpp b/examples/Connection/non_blocking/test_lsock_connector.cpp
index 085db2f5487..5d7fc467251 100644
--- a/examples/Connection/non_blocking/test_lsock_connector.cpp
+++ b/examples/Connection/non_blocking/test_lsock_connector.cpp
@@ -1,6 +1,20 @@
 // $Id$
 
 #include "ace/LSOCK_Connector.h"
+
+#if defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+int
+main (int, char *argv[])
+{
+  ACE_ERROR_RETURN ((LM_INFO,
+                     ASYS_TEXT ("%s: not supported with ")
+                     ASYS_TEXT ("ACE_LACKS_UNIX_DOMAIN_SOCKETS\n"),
+                     argv[0]),
+                     -1);
+}
+
+#else  /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */
+
 #include "ace/UNIX_Addr.h"
 #include "CPP-connector.h"
 
@@ -51,3 +65,5 @@ template class ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SY
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_SYNCH_RW_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#endif /* ! ACE_LACKS_UNIX_DOMAIN_SOCKETS */