Some more cleanup on the build process
This commit is contained in:
@@ -17,7 +17,7 @@ Please note some media files may require significant CPU usage to be transcoded.
|
|||||||
### Debian or Ubuntu packages
|
### Debian or Ubuntu packages
|
||||||
|
|
||||||
```sh
|
```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
|
## Build
|
||||||
|
|||||||
+21
-32
@@ -28,6 +28,27 @@ AC_CHECK_HEADERS([Wt/WApplication],
|
|||||||
[],
|
[],
|
||||||
[AC_MSG_ERROR([Header not found or unusable !])])
|
[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],
|
AC_CHECK_LIB([avutil],
|
||||||
[av_free],
|
[av_free],
|
||||||
,
|
,
|
||||||
@@ -58,48 +79,16 @@ AC_CHECK_LIB( [boost_locale],
|
|||||||
,
|
,
|
||||||
[AC_MSG_ERROR([libboost_locale not found!])])
|
[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],
|
AC_CHECK_LIB( [boost_date_time],
|
||||||
[main],
|
[main],
|
||||||
,
|
,
|
||||||
[AC_MSG_ERROR([libboost_date_time not found!])])
|
[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],
|
AC_CHECK_LIB( [boost_iostreams],
|
||||||
[main],
|
[main],
|
||||||
,
|
,
|
||||||
[AC_MSG_ERROR([libboost_iostreams not found!])])
|
[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
|
AC_CONFIG_FILES([Makefile
|
||||||
src/Makefile
|
src/Makefile
|
||||||
test/Makefile])
|
test/Makefile])
|
||||||
|
|||||||
@@ -29,9 +29,6 @@
|
|||||||
|
|
||||||
#include "service/ServiceManager.hpp"
|
#include "service/ServiceManager.hpp"
|
||||||
#include "service/DatabaseUpdateService.hpp"
|
#include "service/DatabaseUpdateService.hpp"
|
||||||
#if defined HAVE_LMSAPI
|
|
||||||
#include "service/LmsAPIServerService.hpp"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <Wt/WServer>
|
#include <Wt/WServer>
|
||||||
|
|
||||||
@@ -63,10 +60,6 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
serviceManager.add( std::make_shared<Service::DatabaseUpdateService>(*connectionPool));
|
serviceManager.add( std::make_shared<Service::DatabaseUpdateService>(*connectionPool));
|
||||||
|
|
||||||
#if defined HAVE_LMSAPI
|
|
||||||
serviceManager.add( std::make_shared<Service::LmsAPIService>(*connectionPool));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// bind entry point
|
// bind entry point
|
||||||
server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, _1, boost::ref(*connectionPool)));
|
server.addEntryPoint(Wt::Application, boost::bind(UserInterface::LmsApplication::create, _1, boost::ref(*connectionPool)));
|
||||||
|
|
||||||
|
|||||||
@@ -113,6 +113,8 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti
|
|||||||
firstConnection = (Database::User::getAll(DboSession()).size() == 0);
|
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 here is no account in the database, launch the first connection wizard
|
||||||
if (firstConnection)
|
if (firstConnection)
|
||||||
createFirstConnectionUI();
|
createFirstConnectionUI();
|
||||||
|
|||||||
Reference in New Issue
Block a user