* Added "--with-sockets" and made wxSocket optionnal.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -760,6 +760,7 @@ DEFAULT_wxUSE_TIMEDATE=1
 DEFAULT_wxUSE_INTL=1
 DEFAULT_wxUSE_CONFIG=1
 DEFAULT_wxUSE_STREAMS=1
+DEFAULT_wxUSE_SOCKETS=0
 DEFAULT_wxUSE_SERIAL=1
 DEFAULT_wxUSE_DYNLIB_CLASS=1
 
@@ -893,6 +894,10 @@ AC_OVERRIDES(serial,serial,
 **--with-serial           use class serialization,
 wxUSE_SERIAL)
 
+AC_OVERRIDES(sockets,sockets,
+**--with-sockets	  use wxSocket etc classes,
+wxUSE_SOCKETS)
+
 dnl ----------------------------------------------------------------
 dnl user options for PostScript
 dnl ----------------------------------------------------------------

setup/setup.hin

@@ -112,6 +112,10 @@
  * Use class serialization
  */
 #define wxUSE_SERIAL 0
+/*
+ * Use sockets
+ */
+#define wxUSE_SOCKETS 0
 /*
  * Use standard C++ streams if 1. If 0, use wxWin
  * streams implementation.

src/common/ftp.cpp

@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef __MWERKS__
 #include <memory.h>
 #endif
@@ -407,3 +409,5 @@ wxList *wxFTP::GetList(const wxString& wildcard)
 
   return file_list;
 }
+#endif
+  // wxUSE_SOCKETS

src/common/http.cpp

@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -276,3 +278,6 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 
   return inp_stream;
 }
+
+#endif
+   // wxUSE_SOCKETS

src/common/protocol.cpp

@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #endif
@@ -137,3 +139,6 @@ void wxProtocolModule::OnExit()
   delete wxURL::g_proxy;
   wxURL::g_proxy = NULL;
 }
+
+#endif
+  // wxUSE_SOCKETS

src/common/sckaddr.cpp

@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -417,3 +419,6 @@ void wxUNIXaddress::Disassemble(struct sockaddr *addr, size_t len)
   *m_addr = *(struct sockaddr_un *)addr;
 }
 #endif
+
+#endif 
+  // wxUSE_SOCKETS

src/common/sckfile.cpp

@@ -19,6 +19,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -44,3 +46,6 @@ wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
   return new wxFileInputStream(path);
 }
+
+#endif
+  // wxUSE_SOCKETS

src/common/sckipc.cpp

@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -516,3 +518,6 @@ void Server_OnRequest(wxSocketServer& server,
     }
   }
 }
+
+#endif
+  // wxUSE_SOCKETS

src/common/sckstrm.cpp

@@ -19,6 +19,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -86,3 +88,5 @@ wxSocketStream::wxSocketStream(wxSocketBase& s)
 wxSocketStream::~wxSocketStream()
 {
 }
+
+#endif

src/common/socket.cpp

@@ -24,6 +24,8 @@ typedef int socklen_t ;
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 /////////////////////////////////////////////////////////////////////////////
 // wxWindows headers
 /////////////////////////////////////////////////////////////////////////////
@@ -1922,3 +1924,6 @@ void wxMacProcessSocketEvents()
 
 #endif
   // __WXSTUBS__
+
+#endif
+  // wxUSE_SOCKETS

src/common/url.cpp

@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SOCKETS
+
 #ifndef WX_PRECOMP
 #endif
 
@@ -313,3 +315,6 @@ void wxURL::SetProxy(const wxString& url_proxy)
   m_protoname = "proxy";
   m_path = url_proxy;
 }
+
+#endif
+  // wxUSE_SOCKETS

src/msw/data.cpp

@@ -412,6 +412,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
 
 #endif
 
+#if wxUSE_SOCKETS
+
 #include "wx/sckaddr.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
@@ -456,6 +458,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
 IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase)
 
+#endif
+
 #include "wx/statusbr.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)