Changeset 2476

Timestamp:

04/01/08 22:00:36 (9 months ago)

Author:

edmanm

Message:

r290@lysithea: edmanm | 2008-04-01 22:00:19 -0400
Make UPnP support optional (off by default). Add a FindMiniUPnPc.cmake for
checking for the miniupnpc library and location of header files.

Location:

vidalia/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindMiniUPnPc.cmake (added)
• config.h.in (modified) (1 diff)
• src/vidalia/CMakeLists.txt (modified) (4 diffs)
• src/vidalia/config/serversettings.cpp (modified) (2 diffs)

vidalia/trunk/CMakeLists.txt

@@ -63 +63 @@
 endif(USE_QSSLSOCKET)
 
+## UPnP support is currently optional (disabled by default)
+option(USE_MINIUPNPC "Enable UPnP support using the MiniUPnPc library." OFF)
+if (USE_MINIUPNPC)
+  include(${CMAKE_SOURCE_DIR}/cmake/FindMiniUPnPc.cmake)
+endif(USE_MINIUPNPC)
+
 ## Check for system header files
 check_include_file("limits.h" HAVE_LIMITS_H)

vidalia/trunk/config.h.in

@@ -27 +27 @@
 #cmakedefine SIZEOF_INT @SIZEOF_INT@
 
+#cmakedefine HAVE_MINIUPNPC_H
+
+#cmakedefine USE_MINIUPNPC
+
 #endif
 

vidalia/trunk/src/vidalia/CMakeLists.txt

@@ -17 +17 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/config
   ${CMAKE_CURRENT_SOURCE_DIR}/help/browser
-  ${MINIUPNPC_INCLUDE_DIR}
 )
 configure_file(
@@ -63 +62 @@
   config/serverpage.cpp
   config/serversettings.cpp
-  config/upnpcontrol.cpp
   config/torsettings.cpp
   config/vidaliasettings.cpp
@@ -83 +81 @@
   config/serverpage.h
   config/serversettings.h
-  config/upnpcontrol.h
   config/torsettings.h
   config/vidaliasettings.h
   config/vsettings.h
 )
+if (USE_MINIUPNPC)
+  include_directories(${MINIUPNPC_INCLUDE_DIR})
+  set(vidalia_SRCS ${vidalia_SRCS}
+    config/upnpcontrol.cpp
+  )
+  qt4_wrap_cpp(vidalia_SRCS
+    config/upnpcontrol.h
+  )
+endif(USE_MINIUPNPC)
 
 ## Help browser sources
@@ -238 +244 @@
 add_dependencies(${vidalia_BIN} translations)
 
-## Link in miniupnpc
-find_library(MINIUPNPC
-    NAMES miniupnpc
-    PATHS ${MINIUPNPC_LIBRARY_DIR}
-)
 
 ## Link to the Qt libraries and other libraries built as a part of Vidalia
 target_link_libraries(${vidalia_BIN}
   ${QT_LIBRARIES}
-  ${MINIUPNPC}
   torcontrol
   util
 )
+if (USE_MINIUPNPC)
+  target_link_libraries(${vidalia_BIN} ${MINIUPNPC_LIBRARY})
+endif(USE_MINIUPNPC)
+
 if (MINGW)
   target_link_libraries(${vidalia_BIN}

vidalia/trunk/src/vidalia/config/serversettings.cpp

@@ -18 +18 @@
 #include <net.h>
 #include <stringutil.h>
+#include <config.h>
 
 #include "serversettings.h"
 #include "torsettings.h"
+
+#ifdef USE_MINIUPNPC
 #include "upnpcontrol.h"
+#endif
 
 /** Define the set of characters that are valid in a nickname. */
@@ -164 +168 @@
 ServerSettings::configurePortForwarding()
 {
+#ifdef USE_MINIUPNPC
   UPNPControl *pUNPControl = UPNPControl::Instance();
   pUNPControl->forwardPort(getORPort());
+#endif
 }