summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--src/progs/ingen/Makefile.am4
-rw-r--r--src/progs/ingen/main.cpp2
3 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 9682db70..03922315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,6 +287,9 @@ if test "$build_console_clients" = "yes"; then
# Check for glibmm
PKG_CHECK_MODULES(GLIBMM, glibmm-2.4)
+
+ # Check for glib threads
+ PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
# Check for raptor (for RDF serialization)
PKG_CHECK_MODULES(RAPTOR, raptor >= 1.4.14, build_raptor="yes", build_raptor="no")
diff --git a/src/progs/ingen/Makefile.am b/src/progs/ingen/Makefile.am
index 9915cae5..7a500868 100644
--- a/src/progs/ingen/Makefile.am
+++ b/src/progs/ingen/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = @RAUL_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs -DINGEN_MODULE_DIR=\"$(libdir)/ingen\"
+AM_CXXFLAGS = @RAUL_CFLAGS@ @GTHREAD_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs -DINGEN_MODULE_DIR=\"$(libdir)/ingen\"
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = ingen_dev
@@ -7,7 +7,7 @@ desktopfilesdir = $(datadir)/applications
dist_desktopfiles_DATA = ingen.desktop
bin_PROGRAMS = ingen
-ingen_LDADD = @RAUL_LIBS@ ../../libs/module/libingen_module.la
+ingen_LDADD = @RAUL_LIBS@ @GTHREAD_LIBS@../../libs/module/libingen_module.la
ingen_DEPENDENCIES = ../../libs/module/libingen_module.la
ingen_SOURCES = \
diff --git a/src/progs/ingen/main.cpp b/src/progs/ingen/main.cpp
index 720530d0..b8d18e14 100644
--- a/src/progs/ingen/main.cpp
+++ b/src/progs/ingen/main.cpp
@@ -21,6 +21,7 @@
#include <glibmm/convert.h>
#include <glibmm/miscutils.h>
#include <boost/optional.hpp>
+#include <glibmm/thread.h>
#include <raul/Path.h>
#include <raul/RDFWorld.h>
#include <raul/SharedPtr.h>
@@ -71,6 +72,7 @@ main(int argc, char** argv)
SharedPtr<Shared::EngineInterface> engine_interface;
+ Glib::thread_init();
/* Run engine */
if (args.engine_flag) {