diff --git a/README.md b/README.md index ef68c495..3fa2ae33 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Please note some media files may require significant CPU usage to be transcoded. ### Debian or Ubuntu packages ```sh -$ apt-get install g++ autoconf automake libboost-dev libboost-locale-dev libboost-iostreams-dev libboost-log-dev libavcodec-dev libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libavcodec-dev libavformat-dev libavutil +$ apt-get install g++ autoconf automake libboost-dev libboost-locale-dev libboost-iostreams-dev libavcodec-dev libwtdbosqlite-dev libwthttp-dev libwtdbo-dev libwt-dev libmagick++-dev libavcodec-dev libavformat-dev libav-tools ``` ## Build diff --git a/configure.ac b/configure.ac index c7af1f14..344ee0e3 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,27 @@ AC_CHECK_HEADERS([Wt/WApplication], [], [AC_MSG_ERROR([Header not found or unusable !])]) +AC_CHECK_LIB([wt], + [main], + , + [AC_MSG_ERROR([libwt not found!])]) + +AC_CHECK_LIB([wtdbo], + [main], + , + [AC_MSG_ERROR([libwtdbo not found!])]) + +AC_CHECK_LIB([wtdbosqlite3], + [main], + , + [AC_MSG_ERROR([libwtdbosqlite3 not found!])]) + +AC_CHECK_LIB([wthttp], + [main], + , + [AC_MSG_ERROR([libwthttp not found!])]) + + AC_CHECK_LIB([avutil], [av_free], , @@ -58,48 +79,16 @@ AC_CHECK_LIB( [boost_locale], , [AC_MSG_ERROR([libboost_locale not found!])]) -AC_CHECK_LIB( [boost_thread], - [main], - , - [AC_MSG_ERROR([libboost_thread not found!])]) - AC_CHECK_LIB( [boost_date_time], [main], , [AC_MSG_ERROR([libboost_date_time not found!])]) -#AC_CHECK_LIB( [boost_signals], -# [main], -# , -# [AC_MSG_ERROR([libboost_signals not found!])]) - AC_CHECK_LIB( [boost_iostreams], [main], , [AC_MSG_ERROR([libboost_iostreams not found!])]) -# TODO -> PARAMETRIZE THIS -AC_CHECK_LIB([wthttp], - [main], - , - [AC_MSG_ERROR([libwthttp not found!])]) - -AC_CHECK_LIB([wtdbosqlite3], - [main], - , - [AC_MSG_ERROR([libwtdbosqlite3 not found!])]) - -AC_CHECK_LIB([wtdbo], - [main], - , - [AC_MSG_ERROR([libwtdbo not found!])]) - -AC_CHECK_LIB([wt], - [main], - , - [AC_MSG_ERROR([libwt not found!])]) - - AC_CONFIG_FILES([Makefile src/Makefile test/Makefile]) diff --git a/src/config/.empty b/src/config/.empty new file mode 100644 index 00000000..e69de29b diff --git a/src/main/main.cpp b/src/main/main.cpp index 32338881..dae3f710 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -29,9 +29,6 @@ #include "service/ServiceManager.hpp" #include "service/DatabaseUpdateService.hpp" -#if defined HAVE_LMSAPI -#include "service/LmsAPIServerService.hpp" -#endif #include @@ -63,10 +60,6 @@ int main(int argc, char* argv[]) serviceManager.add( std::make_shared(*connectionPool)); -#if defined HAVE_LMSAPI - serviceManager.add( std::make_shared(*connectionPool)); -#endif - // bind entry point server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, _1, boost::ref(*connectionPool))); diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index b00d7ba8..0011ed78 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -113,6 +113,8 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti firstConnection = (Database::User::getAll(DboSession()).size() == 0); } + LMS_LOG(UI, DEBUG) << "Creating root widget. First connection = " << std::boolalpha << firstConnection; + // If here is no account in the database, launch the first connection wizard if (firstConnection) createFirstConnectionUI();