Always build with updater. Use 'beta/stable' channel seletor in 'General Settins' dialog with default 'stable'.

Signed-off-by: alex-z <blackslayer4@gmail.com>

CMakeLists.txt

@@ -123,11 +123,8 @@ if(NO_MSG_HANDLER)
    add_definitions(-DNO_MSG_HANDLER=1)
 endif()
 
-# this option builds the updater
-option(BUILD_UPDATER "BUILD_UPDATER" OFF)
 if(BUILD_UPDATER)
    message("Compiling with updater")
-   add_definitions(-DBUILD_UPDATER=1)
 else()
    message("Compiling without updater")
 endif()

NEXTCLOUD.cmake

@@ -30,7 +30,7 @@ option( WITH_CRASHREPORTER "Build crashreporter" OFF )
 #set( CRASHREPORTER_ICON ":/owncloud-icon.png" )
 
 ## Updater options
-option( BUILD_UPDATER "Build updater" OFF )
+option( BUILD_UPDATER "Build updater" ON )
 
 option( WITH_PROVIDERS "Build with providers list" ON )
 

config.h.in

@@ -42,4 +42,6 @@
 
 #cmakedefine01 GUI_TESTING
 
+#cmakedefine BUILD_UPDATER "@BUILD_UPDATER@"
+
 #endif

src/gui/generalsettings.cpp

@@ -36,8 +36,6 @@
 #include "common/utility.h"
 #include "logger.h"
 
-#include "config.h"
-
 #include "legalnotice.h"
 
 #include <QFileDialog>

src/gui/generalsettings.h

@@ -15,6 +15,8 @@
 #ifndef MIRALL_GENERALSETTINGS_H
 #define MIRALL_GENERALSETTINGS_H
 
+#include "config.h"
+
 #include <QWidget>
 #include <QPointer>