[Opensync-commits] r991 - trunk

[<svn...@op...>]

Author: bellmich
Date: Wed Mar 18 13:12:37 2009
New Revision: 991
URL: http://libsyncml.opensync.org/changeset/991

Log:
fixed Solaris and libsoup 2.2 detection again

Modified:
   trunk/CMakeLists.txt

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt	Wed Mar 18 12:30:56 2009	(r990)
+++ trunk/CMakeLists.txt	Wed Mar 18 13:12:37 2009	(r991)
@@ -118,21 +118,24 @@
 	SET( ENABLE_WBXML ON)
 ENDIF(LIBWBXML2_FOUND)
 
-OPTION( HAVE_LIBSOUP22_SOLARIS "enable Solaris libsoup workarounds" OFF )
 IF(LIBSOUP2_FOUND)
 	OPTION( ENABLE_HTTP "enable http transports" ON )
 	IF (LIBSOUP24_FOUND)
-		OPTION ( HAVE_LIBSOUP24 "building with libsoup 2.4" ON )
-		OPTION ( HAVE_LIBSOUP22 "building with libsoup 2.2" OFF )
+		OPTION( HAVE_LIBSOUP24 "building with libsoup 2.4" ON )
+		OPTION( HAVE_LIBSOUP22 "building with libsoup 2.2" OFF )
+		OPTION( HAVE_LIBSOUP22_SOLARIS "enable Solaris libsoup workarounds" OFF )
 	ELSE (LIBSOUP24_FOUND)
-		OPTION ( HAVE_LIBSOUP24 "building with libsoup 2.4" OFF )
-		OPTION ( HAVE_LIBSOUP22 "building with libsoup 2.2" ON )
+		OPTION( HAVE_LIBSOUP24 "building with libsoup 2.4" OFF )
+		OPTION( HAVE_LIBSOUP22 "building with libsoup 2.2" ON )
 		IF( CMAKE_SYSTEM_NAME STREQUAL "SunOS" )
 			OPTION( HAVE_LIBSOUP22_SOLARIS "enable Solaris libsoup workarounds" ON )
+		ELSE( CMAKE_SYSTEM_NAME STREQUAL "SunOS" )
+			OPTION( HAVE_LIBSOUP22_SOLARIS "enable Solaris libsoup workarounds" OFF )
 		ENDIF( CMAKE_SYSTEM_NAME STREQUAL "SunOS" )
 	ENDIF (LIBSOUP24_FOUND)
 ELSE(LIBSOUP2_FOUND)
-	SET( ENABLE_HTTP OFF )
+	OPTION( ENABLE_HTTP "enable http transports" OFF )
+	OPTION( HAVE_LIBSOUP22_SOLARIS "enable Solaris libsoup workarounds" OFF )
 ENDIF(LIBSOUP2_FOUND)
 
 IF(OPENOBEX_FOUND)