[vidalia-svn] r2230: Make USE_QSSLSOCKET an option, if QSslSocket is available. (trunk)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-17 19:43:04 -0500 (Mon, 17 Dec 2007)
New Revision: 2230

Modified:
   trunk/
   trunk/CMakeLists.txt
Log:
 r2328@lysithea:  edmanm | 2007-12-17 19:42:58 -0500
 Make USE_QSSLSOCKET an option, if QSslSocket is available.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2328] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2007-12-18 00:31:49 UTC (rev 2229)
+++ trunk/CMakeLists.txt	2007-12-18 00:43:04 UTC (rev 2230)
@@ -67,7 +67,7 @@
 if(HAVE_QSSLSOCKET_H)
   check_symbol_exists(QT_NO_OPENSSL "QtGlobal" QT_NO_SSL_SUPPORT)
   if(NOT QT_NO_SSL_SUPPORT)
-    set(USE_QSSLSOCKET 1)
+    option(USE_QSSLSOCKET "Use Qt's QSslSocket for GeoIP lookups." ON)
   endif(NOT QT_NO_SSL_SUPPORT)
 endif(HAVE_QSSLSOCKET_H)