From 487ad85fad8f59555a44a877d5b68b3ada4ef0ad 2012-11-12 21:18:15
From: chain <chain@rpgfiction.net>
Date: 2012-11-12 21:18:15
Subject: [PATCH] make Twitter optional (by using ENABLE_TWITTER)

---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 213fc1e076eb8cb34707fea98998a2315e10026f..0147cf25178f60a836daacc4be040624ea117d2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ option(ENABLE_PQXX "Build with Postgres supoort" ON)
 option(ENABLE_IRC "Build IRC plugin" ON)
 option(ENABLE_PURPLE "Build Libpurple plugin" ON)
 option(ENABLE_SKYPE "Build Skype plugin" ON)
-#option(ENABLE_TWITTER "Build Twitter plugin" ON)
+option(ENABLE_TWITTER "Build Twitter plugin" ON)
 option(ENABLE_YAHOO2 "Build Libyahoo2 plugin" ON)
 
 option(ENABLE_DOCS "Build Docs" ON)
@@ -373,10 +373,16 @@ if (PROTOBUF_FOUND)
 				message("Skype plugin      : no (user disabled)")
 			endif()
 		endif()
+		if(ENABLE_TWITTER)
+			message("Twitter plugin    : yes")
+		else(ENABLE_TWITTER)
+			message("Twitter plugin    : no (user disabled)")
+		endif()
 	else()
-		message("Frotz plugin      : no")
-		message("SMSTools3 plugin  : no")
-		message("Skype plugin      : no")
+		message("Frotz plugin      : no (does not run on Win32)")
+		message("SMSTools3 plugin  : no (does not run on Win32)")
+		message("Skype plugin      : no (does not run on Win32)")
+		message("Twitter plugin    : no (does not run on Win32)")
 	endif()
 
  	if(YAHOO2_FOUND)
@@ -391,8 +397,6 @@ if (PROTOBUF_FOUND)
  	endif()
 
 	message("Swiften plugin    : yes")
-    message("Twitter plugin    : yes")
-
 else()
 	message("Network plugins   : no (install libprotobuf-dev)")
 	message("Libpurple plugin  : no (install libpurple and libprotobuf-dev)")
diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt
index 3b843b1c5af743b5bbaff9f49790219a5f7006ac..1306f711174b61141d31497660eacc413ad27d11 100644
--- a/backends/CMakeLists.txt
+++ b/backends/CMakeLists.txt
@@ -18,7 +18,9 @@ if (NOT WIN32)
  	if(YAHOO2_FOUND)
 		ADD_SUBDIRECTORY(libyahoo2)
  	endif()
-	ADD_SUBDIRECTORY(twitter)
+	if(ENABLE_TWITTER)
+		ADD_SUBDIRECTORY(twitter)
+	endif()
 	if (${LIBDBUSGLIB_FOUND})
 		ADD_SUBDIRECTORY(skype)
 	endif()