[vidalia-svn] r2645: Build with miniupnpc support by default. The checkbox still (in vidalia: . trunk)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-06-02 18:35:58 -0400 (Mon, 02 Jun 2008)
New Revision: 2645

Modified:
   vidalia/
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/INSTALL
Log:
 r426@thebe:  edmanm | 2008-06-02 18:36:31 -0400
 Build with miniupnpc support by default. The checkbox still defaults to
 disabled.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r426] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2008-06-02 15:00:13 UTC (rev 2644)
+++ vidalia/trunk/CMakeLists.txt	2008-06-02 22:35:58 UTC (rev 2645)
@@ -68,8 +68,8 @@
   endif(MSVC OR UNIX)
 endif(USE_QSSLSOCKET)
 
-## UPnP support is currently optional (disabled by default)
-option(USE_MINIUPNPC "Enable UPnP support using the MiniUPnPc library." OFF)
+## UPnP support is currently optional (enabled by default)
+option(USE_MINIUPNPC "Enable UPnP support using the MiniUPnPc library." ON)
 
 ## Check for system header files
 check_include_file("limits.h" HAVE_LIMITS_H)

Modified: vidalia/trunk/INSTALL
===================================================================
--- vidalia/trunk/INSTALL	2008-06-02 15:00:13 UTC (rev 2644)
+++ vidalia/trunk/INSTALL	2008-06-02 22:35:58 UTC (rev 2645)
@@ -183,7 +183,7 @@
   -DUSE_QSSLSOCKET=0                      Disable building Vidalia with SSL
                                           support.
 
-  -DUSE_MINIUPNPC=1                       Build Vidalia with UPnP support.
+  -DUSE_MINIUPNPC=0                       Disable UPnP support in Vidalia.
 
   -DOSX_FAT_BINARY=1                      Build Vidalia as a Universal binary.