[haiku-commits] haiku: hrev43307 - src/kits/network/libnetapi

From: axeld@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 22 Nov 2011 01:01:04 +0100 (CET)
hrev43307 adds 1 changeset to branch 'master'
old head: 362ae0a27ec6b9e26146940d46785fa26a4bec0a
new head: e2c30bd6c2e07b26c35ef022219464d09c316519

----------------------------------------------------------------------------

1 files changed, 24 insertions(+), 1 deletions(-)
src/kits/network/libnetapi/Jamfile |   25 ++++++++++++++++++++++++-

############################################################################

Revision:    hrev43307
Commit:      e2c30bd6c2e07b26c35ef022219464d09c316519
URL:         http://cgit.haiku-os.org/haiku/commit/?id=e2c30bd
Author:      Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date:        Mon Nov 21 22:59:12 2011 UTC

Forgot to include the Jamfile in the commit.

* The socket API is now actually available.

----------------------------------------------------------------------------

diff --git a/src/kits/network/libnetapi/Jamfile 
b/src/kits/network/libnetapi/Jamfile
index aa7280b..30f5efe 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -6,6 +6,20 @@ UseHeaders [ FDirName $(HAIKU_TOP) src libs compat 
freebsd_network compat ]
        : true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
 
+local sslSources ;
+if $(HAIKU_OPENSSL_ENABLED) {
+       SubDirC++Flags -DOPENSSL_ENABLED ;
+       SubDirSysHdrs $(HAIKU_OPENSSL_HEADERS) ;
+       sslSources = SSL.cpp ;
+       Includes [ FGristFiles $(sslSources) SecureSocket.cpp ]
+               : $(HAIKU_OPENSSL_HEADERS_DEPENDENCY) ;
+               # Dependency needed to trigger downloading/unzipping the 
package before
+               # compiling the files.
+       SetupFeatureObjectsDir ssl ;
+} else {
+       SetupFeatureObjectsDir no-ssl ;
+}
+
 SharedLibrary libbnetapi.so :
        init.cpp
        DynamicBuffer.cpp
@@ -14,6 +28,8 @@ SharedLibrary libbnetapi.so :
        NetBuffer.cpp
        NetDebug.cpp
 
+       $(sslSources)
+
        NetworkAddress.cpp
        NetworkAddressResolver.cpp
        NetworkCookie.cpp
@@ -22,6 +38,11 @@ SharedLibrary libbnetapi.so :
        NetworkInterface.cpp
        NetworkRoster.cpp
 
+       AbstractSocket.cpp
+       DatagramSocket.cpp
+       Socket.cpp
+       SecureSocket.cpp
+
        # TODO: The HTTP stuff should all go into an add-on. It needs linking
        # against libcrypto.so and only the add-on should link against it.
        # Building of the commented out files has not been completely tested 
after
@@ -43,5 +64,7 @@ SharedLibrary libbnetapi.so :
 #      UrlResult.cpp
 #      UrlSynchronousRequest.cpp
 
-       : be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a
+       :
+       be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) $(HAIKU_OPENSSL_LIBS)
+       libshared.a
 ;
[haiku-commits] haiku: hrev43307 - src/kits/network/libnetapi

Other related posts:
