[Opensync-commits] r895 - in trunk/libsyncml: . transports

[<dg...@su...>]

Author: bellmich
Date: Mon Jan 19 11:47:43 2009
New Revision: 895
URL: http://libsyncml.opensync.org/changeset/895

Log:
fixed build environment to build correctly
if OpenOBEX or libsoup are missing

ticket #211

Modified:
   trunk/libsyncml/CMakeLists.txt
   trunk/libsyncml/transports/http_client.c
   trunk/libsyncml/transports/http_server.c
   trunk/libsyncml/transports/obex_client.c
   trunk/libsyncml/transports/obex_server.c

Modified: trunk/libsyncml/CMakeLists.txt
==============================================================================
--- trunk/libsyncml/CMakeLists.txt	Tue Jan 13 10:50:36 2009	(r894)
+++ trunk/libsyncml/CMakeLists.txt	Mon Jan 19 11:47:43 2009	(r895)
@@ -32,14 +32,26 @@
 	parser/sml_wbxml.c
 	parser/sml_xml_assm.c
 	parser/sml_xml_parse.c
-	transports/http_client.c
-	transports/http_server.c
-	transports/obex_client.c
-	transports/obex_server.c
-	transports/obex_client_samsung.c
-	transports/obex.c
 )
 
+IF ( ENABLE_OBEX )
+	SET( libsyncml_LIB_SRCS
+		${libsyncml_LIB_SRCS}
+		transports/obex_client.c
+		transports/obex_server.c
+		transports/obex_client_samsung.c
+		transports/obex.c
+	)
+ENDIF ( ENABLE_OBEX )
+
+IF ( ENABLE_HTTP )
+	SET( libsyncml_LIB_SRCS
+		${libsyncml_LIB_SRCS}
+		transports/http_client.c
+		transports/http_server.c
+	)
+ENDIF ( ENABLE_HTTP )
+
 ADD_LIBRARY( syncml SHARED ${libsyncml_LIB_SRCS} )
 
 SET_TARGET_PROPERTIES( syncml PROPERTIES SOVERSION ${LIBSYNCML_LIBVERSION_SOVERSION} )

Modified: trunk/libsyncml/transports/http_client.c
==============================================================================
--- trunk/libsyncml/transports/http_client.c	Tue Jan 13 10:50:36 2009	(r894)
+++ trunk/libsyncml/transports/http_client.c	Mon Jan 19 11:47:43 2009	(r895)
@@ -23,7 +23,6 @@
 #include <libsyncml/syncml_internals.h>
 #include <libsyncml/sml_error_internals.h>
 
-#ifdef ENABLE_HTTP
 #include <libsyncml/sml_transport_internals.h>
 
 #include "http_client_internals.h"
@@ -498,5 +497,3 @@
 	return TRUE;
 }
 
-#endif //ENABLE_HTTP
-

Modified: trunk/libsyncml/transports/http_server.c
==============================================================================
--- trunk/libsyncml/transports/http_server.c	Tue Jan 13 10:50:36 2009	(r894)
+++ trunk/libsyncml/transports/http_server.c	Mon Jan 19 11:47:43 2009	(r895)
@@ -23,7 +23,6 @@
 #include <libsyncml/syncml.h>
 #include <libsyncml/syncml_internals.h>
 
-#ifdef ENABLE_HTTP
 #include <libsyncml/sml_error_internals.h>
 #include <libsyncml/sml_transport_internals.h>
 
@@ -818,5 +817,3 @@
 	return TRUE;
 }
 
-#endif //ENABLE_HTTP
-

Modified: trunk/libsyncml/transports/obex_client.c
==============================================================================
--- trunk/libsyncml/transports/obex_client.c	Tue Jan 13 10:50:36 2009	(r894)
+++ trunk/libsyncml/transports/obex_client.c	Mon Jan 19 11:47:43 2009	(r895)
@@ -22,7 +22,6 @@
 #include <libsyncml/syncml.h>
 #include <libsyncml/syncml_internals.h>
  
-#ifdef ENABLE_OBEX
 #include <libsyncml/sml_error_internals.h>
 #include <libsyncml/sml_transport_internals.h>
 
@@ -1317,5 +1316,3 @@
 	return TRUE;
 }
 
-#endif //ENABLE_OBEX
-

Modified: trunk/libsyncml/transports/obex_server.c
==============================================================================
--- trunk/libsyncml/transports/obex_server.c	Tue Jan 13 10:50:36 2009	(r894)
+++ trunk/libsyncml/transports/obex_server.c	Mon Jan 19 11:47:43 2009	(r895)
@@ -23,7 +23,6 @@
 #include <libsyncml/syncml_internals.h>
 #include <libsyncml/sml_error_internals.h>
 
-#ifdef ENABLE_OBEX
 #include <libsyncml/sml_transport_internals.h>
 
 #include "obex_internals.h"
@@ -853,5 +852,3 @@
 	return TRUE;
 }
 
-#endif //ENABLE_OBEX
-