WebUI is now optional but enabled by default at compile time

libresapi/src/libresapi.pro

@@ -8,10 +8,11 @@ TARGET = resapi
 TARGET_PRL = libresapi
 DESTDIR = lib
 
-CONFIG += libmicrohttpd
-
 INCLUDEPATH += ../../libretroshare/src
 
+libresapihttpserver {
+    CONFIG += libmicrohttpd
+
     unix {
 
         webui_files.path = "$${DATA_DIR}/webui"
@@ -106,7 +107,6 @@ win32{
 	system($$MAKE_SRC\\init.bat .)
     }
 
-libmicrohttpd{
 	linux {
 		CONFIG += link_pkgconfig
 		PKGCONFIG *= libmicrohttpd

retroshare-gui/src/gui/AboutDialog.cpp

@@ -29,7 +29,10 @@
 #include <retroshare/rsdisc.h>
 #include <retroshare/rspeers.h>
 #include "settings/rsharesettings.h"
+
+#ifdef ENABLE_WEBUI
 #include <microhttpd.h>
+#endif
 
 #include <QClipboard>
 #include <QSysInfo>
@@ -781,11 +784,13 @@ void AboutDialog::on_copy_button_clicked()
     RsControl::instance()->getLibraries(libraries);
     verInfo+=addLibraries("libretroshare", libraries);
 
+#ifdef ENABLE_WEBUI
     /* Add version numbers of RetroShare */
     // Add versions here. Find a better place.
     libraries.clear();
     libraries.push_back(RsLibraryInfo("Libmicrohttpd", MHD_get_version()));
     verInfo+=addLibraries("RetroShare", libraries);
+#endif // ENABLE_WEBUI
 
     /* Add version numbers of plugins */
     if (rsPlugins) {

retroshare-gui/src/gui/HelpDialog.cpp

@@ -24,7 +24,10 @@
 
 #include <retroshare/rsiface.h>
 #include <retroshare/rsplugin.h>
+
+#ifdef ENABLE_WEBUI
 #include <microhttpd.h>
+#endif // ENABLE_WEBUI
 
 #include <QFile>
 #include <QTextStream>
@@ -94,11 +97,13 @@ HelpDialog::HelpDialog(QWidget *parent) :
 	RsControl::instance()->getLibraries(libraries);
 	addLibraries(ui->libraryLayout, "libretroshare", libraries);
 
+#ifdef ENABLE_WEBUI
 	/* Add version numbers of RetroShare */
 	// Add versions here. Find a better place.
 	libraries.clear();
 	libraries.push_back(RsLibraryInfo("Libmicrohttpd", MHD_get_version()));
 	addLibraries(ui->libraryLayout, "RetroShare", libraries);
+#endif // ENABLE_WEBUI
 
 	/* Add version numbers of plugins */
 	if (rsPlugins) {

retroshare-gui/src/gui/MainWindow.cpp

@@ -562,7 +562,9 @@ void MainWindow::createTrayIcon()
     trayMenu->addSeparator();
     trayMenu->addAction(QIcon(IMAGE_MESSENGER), tr("Open Messenger"), this, SLOT(showMessengerWindow()));
     trayMenu->addAction(QIcon(IMAGE_MESSAGES), tr("Open Messages"), this, SLOT(showMess()));
+#ifdef ENABLE_WEBUI
     trayMenu->addAction(QIcon(":/images/emblem-web.png"), tr("Show web interface"), this, SLOT(showWebinterface()));
+#endif // ENABLE_WEBUI
     trayMenu->addAction(QIcon(IMAGE_BWGRAPH), tr("Bandwidth Graph"), _bandwidthGraph, SLOT(showWindow()));
     trayMenu->addAction(QIcon(IMAGE_DHT), tr("Statistics"), this, SLOT(showStatisticsWindow()));
 
@@ -1061,10 +1063,12 @@ void MainWindow::showStatisticsWindow()
     StatisticsWindow::showYourself();
 }
 
+#ifdef ENABLE_WEBUI
 void MainWindow::showWebinterface()
 {
     WebuiPage::showWebui();
 }
+#endif // ENABLE_WEBUI
 
 /** Shows Application window */
 #ifdef UNFINISHED

retroshare-gui/src/gui/MainWindow.h

@@ -211,7 +211,9 @@ private slots:
     void newRsCollection();
     void showMessengerWindow();
     void showStatisticsWindow();
+#ifdef ENABLE_WEBUI
     void showWebinterface();
+#endif
     //void servicePermission();
 
 #ifdef UNFINISHED    

retroshare-gui/src/gui/settings/WebuiPage.cpp

@@ -15,7 +15,7 @@
 
 resource_api::ApiServer* WebuiPage::apiServer = 0;
 resource_api::ApiServerMHD* WebuiPage::apiServerMHD = 0;
-// TODO: LIBRESAPI_LOCAL_SERVER Move in appropriate place
+// TODO: LIBRESAPI_LOCAL_SERVER Put indipendent option for libresapilocalserver in appropriate place
 #ifdef LIBRESAPI_LOCAL_SERVER
 resource_api::ApiServerLocal* WebuiPage::apiServerLocal = 0;
 #endif

retroshare-gui/src/gui/settings/rsettingswin.cpp

@@ -152,8 +152,9 @@ RSettingsWin::initStackedWidget()
     addPage(new AppearancePage());
     addPage(new SoundPage() );
     addPage(new ServicePermissionsPage() );
+#ifdef ENABLE_WEBUI
     addPage(new WebuiPage() );
-
+#endif // ENABLE_WEBUI
 	 // add widgets from plugins
 
 	for(int i=0;i<rsPlugins->nbPlugins();++i)

retroshare-gui/src/main.cpp

@@ -397,13 +397,17 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 
 	notify->enable() ;	// enable notification system after GUI creation, to avoid data races in Qt.
 
+#ifdef ENABLE_WEBUI
     WebuiPage::checkStartWebui();
+#endif // ENABLE_WEBUI
 
 	/* dive into the endless loop */
 	int ti = rshare.exec();
 	delete w ;
 
+#ifdef ENABLE_WEBUI
 	WebuiPage::checkShutdownWebui();
+#endif // ENABLE_WEBUI
 
 	/* cleanup */
 	ChatDialog::cleanupChat();

retroshare-gui/src/retroshare-gui.pro

@@ -551,7 +551,6 @@ HEADERS +=  rshare.h \
             gui/connect/ConnectProgressDialog.h \
             gui/groups/CreateGroup.h \
             gui/GetStartedDialog.h \
-    gui/settings/WebuiPage.h \
         gui/statistics/BWGraph.h \
     util/RsSyntaxHighlighter.h \
     util/imageutil.h
@@ -671,7 +670,7 @@ FORMS +=    gui/StartDialog.ui \
             gui/statistics/BwCtrlWindow.ui \
             gui/statistics/RttStatistics.ui \
             gui/GetStartedDialog.ui \
-    gui/settings/WebuiPage.ui
+
 
 #            gui/ForumsDialog.ui \
 #            gui/forums/CreateForum.ui \
@@ -854,7 +853,6 @@ SOURCES +=  main.cpp \
             gui/settings/ServicePermissionsPage.cpp \
             gui/settings/AddFileAssociationDialog.cpp \
             gui/settings/GroupFrameSettingsWidget.cpp \
-                gui/settings/WebuiPage.cpp \
             gui/statusbar/peerstatus.cpp \
             gui/statusbar/natstatus.cpp \
             gui/statusbar/dhtstatus.cpp \
@@ -1390,3 +1388,9 @@ gxsgui {
 	
 	
 }
+
+libresapihttpserver {
+    HEADERS *= gui/settings/WebuiPage.h
+    SOURCES *= gui/settings/WebuiPage.cpp
+    FORMS *= gui/settings/WebuiPage.ui
+}

retroshare-nogui/src/retroshare-nogui.pro

@@ -5,8 +5,6 @@ TARGET = RetroShare06-nogui
 CONFIG += bitdht
 #CONFIG += introserver
 #CONFIG += sshserver
-# webinterface, requires libmicrohttpd
-CONFIG += webui
 CONFIG -= qt xml gui
 CONFIG += link_prl
 
@@ -184,7 +182,7 @@ introserver {
 	DEFINES *= RS_INTRO_SERVER
 }
 
-webui {
+libresapihttpserver {
 	DEFINES *= ENABLE_WEBUI
         PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
 	LIBS += ../../libresapi/src/lib/libresapi.a

retroshare.pri

@@ -2,6 +2,9 @@
 # {,un}comment the following line
 #CONFIG *= libresapilocalserver
 
+# To {dis,en}able libresapi via HTTP (libmicrohttpd) {,un}comment the following line
+CONFIG *= libresapihttpserver
+
 # Gxs is always enabled now.
 DEFINES *= RS_ENABLE_GXS
 
@@ -14,6 +17,25 @@ unix {
 	isEmpty(PLUGIN_DIR) { PLUGIN_DIR  = "$${LIB_DIR}/retroshare/extensions6" }
 }
 
+android-g++ {
+    DEFINES *= NO_SQLCIPHER
+    DEFINES *= "fopen64=fopen"
+    DEFINES *= "fseeko64=fseeko"
+    DEFINES *= "ftello64=ftello"
+    INCLUDEPATH *= $$NDK_TOOLCHAIN_PATH/sysroot/usr/include/
+    LIBS *= -L$$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/
+    LIBS *= -lssl -lcrypto -lsqlite3 -lupnp -lixml
+    ANDROID_EXTRA_LIBS *= $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libcrypto.so
+    ANDROID_EXTRA_LIBS *= $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libssl.so
+    ANDROID_EXTRA_LIBS *= $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libbz2.so
+    ANDROID_EXTRA_LIBS *= $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libsqlite3.so
+    ANDROID_EXTRA_LIBS *= $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libupnp.so
+    ANDROID_EXTRA_LIBS *= $$NDK_TOOLCHAIN_PATH/sysroot/usr/lib/libixml.so
+    message(NDK_TOOLCHAIN_PATH: $$NDK_TOOLCHAIN_PATH)
+    message(LIBS: $$LIBS)
+    message(ANDROID_EXTRA_LIBS: $$ANDROID_EXTRA_LIBS)
+}
+
 win32 {
 	message(***retroshare.pri:Win32)
 	exists($$PWD/../libs) {
@@ -68,3 +90,4 @@ unfinished {
 wikipoos:DEFINES *= RS_USE_WIKI
 
 libresapilocalserver:DEFINES *= LIBRESAPI_LOCAL_SERVER
+libresapihttpserver::DEFINES *= ENABLE_WEBUI