diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-11-24 11:27:26 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-11-24 11:27:26 +0100 |
| commit | b6e6635dca3c929df0240fad174838e7cd17ccf3 (patch) | |
| tree | 69e5af070df9ea0a7680f450166c3565758fb30e /src | |
| parent | 501d003fce99e6a9c366d9bbac5c2a293dce9163 (diff) | |
| download | connman-b6e6635dca3c929df0240fad174838e7cd17ccf3.tar.gz connman-b6e6635dca3c929df0240fad174838e7cd17ccf3.tar.bz2 connman-b6e6635dca3c929df0240fad174838e7cd17ccf3.zip | |
Make threading support optional
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/main.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6c3d6039..f49e18e4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ connmand_SOURCES = main.c connman.h log.c error.c plugin.c profile.c \ element.c device.c network.c security.c resolver.c \ storage.c manager.c agent.c rtnl.c dbus.c -connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl +connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ -ldl connmand_LDFLAGS = -Wl,--export-dynamic -Wl,--version-script=connman.ver @@ -33,7 +33,7 @@ else plugindir = $(libdir)/connman/plugins endif -AM_CFLAGS = @GTHREAD_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \ +AM_CFLAGS = @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \ -DSTATEDIR=\""$(statedir)"\" \ -DSTORAGEDIR=\""$(storagedir)\"" \ -DPLUGINDIR=\""$(plugindir)"\" @@ -76,8 +76,10 @@ int main(int argc, char *argv[]) DBusError err; struct sigaction sa; +#ifdef NEED_THREADS if (g_thread_supported() == FALSE) g_thread_init(NULL); +#endif context = g_option_context_new(NULL); g_option_context_add_main_entries(context, options, NULL); @@ -108,10 +110,12 @@ int main(int argc, char *argv[]) main_loop = g_main_loop_new(NULL, FALSE); +#ifdef NEED_THREADS if (dbus_threads_init_default() == FALSE) { fprintf(stderr, "Can't init usage of threads\n"); exit(1); } +#endif dbus_error_init(&err); |