From 8814eec3eb0fbba7ce32bb85092afb77778d3ba3 Mon Sep 17 00:00:00 2001 From: Derex Date: Thu, 20 May 2010 00:14:31 +0300 Subject: [PATCH] [9936] Remove sockets library from UNIX build --- configure.ac | 1 - dep/include/Makefile.am | 28 ---------------------------- dep/src/Makefile.am | 2 +- src/shared/revision_nr.h | 2 +- 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/configure.ac b/configure.ac index 90b332abc..1fc4248ff 100644 --- a/configure.ac +++ b/configure.ac @@ -281,7 +281,6 @@ AC_CONFIG_FILES([ dep/lib/Makefile dep/src/Makefile dep/src/g3dlite/Makefile - dep/src/sockets/Makefile dep/src/zlib/Makefile dep/src/gsoap/Makefile dep/Makefile diff --git a/dep/include/Makefile.am b/dep/include/Makefile.am index 6e7289426..afdfa0122 100644 --- a/dep/include/Makefile.am +++ b/dep/include/Makefile.am @@ -160,34 +160,6 @@ EXTRA_DIST += \ postgre/pg_type.h \ postgre/postgres_ext.h -# Sockets header files for Win32 builds -EXTRA_DIST += \ - sockets\Base64.h \ - sockets\CircularBuffer.h \ - sockets\IFile.h \ - sockets\Ipv4Address.h \ - sockets\Ipv6Address.h \ - sockets\ISocketHandler.h \ - sockets\ListenSocket.h \ - sockets\Mutex.h \ - sockets\Parse.h \ - sockets\RandomNumber.h \ - sockets\ResolvServer.h \ - sockets\ResolvSocket.h \ - sockets\SctpSocket.h \ - sockets\Socket.h \ - sockets\socket_include.h \ - sockets\SocketAddress.h \ - sockets\SocketHandler.h \ - sockets\sockets-config.h \ - sockets\StdLog.h \ - sockets\StdoutLog.h \ - sockets\TcpSocket.h \ - sockets\Thread.h \ - sockets\UdpSocket.h \ - sockets\Uid.h \ - sockets\Utility.h - # VLD header files for Win32 builds EXTRA_DIST += \ vld/vld.h diff --git a/dep/src/Makefile.am b/dep/src/Makefile.am index ac4f90523..b5648b3cd 100644 --- a/dep/src/Makefile.am +++ b/dep/src/Makefile.am @@ -17,7 +17,7 @@ ## Process this file with automake to produce Makefile.in ## Sub-directories to parse -SUBDIRS = g3dlite sockets gsoap zlib +SUBDIRS = g3dlite gsoap zlib ## Additional files to include when running 'make dist' # Nothing yet. diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a0f9c38bb..5b410b9bc 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9935" + #define REVISION_NR "9936" #endif // __REVISION_NR_H__