diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2011-10-25 10:21:51 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-10-25 10:21:51 +0200 |
| commit | d195d3b82a9cf5acef2c8ae3c6ce0907c5f61059 (patch) | |
| tree | 1fe13baf1bf803d916005190dd07bce2c2e39f97 /tests/Makefile.am | |
| parent | 327c2f61705e52d419da86e30d0ae91aaaedd25d (diff) | |
| download | glibmm-d195d3b82a9cf5acef2c8ae3c6ce0907c5f61059.tar.gz | |
Fix the make check build by always linking to gthread-2.0.
* configure.ac: Always use gthread-2.0 because there is now no advantage to
not doing that, because threading is now always enabled in glib.
Remove the separate GTHREAD* variables.
* glib/glibmm/Makefile.am:
* gio/giomm/Makefile.am:
* tests/Makefile.am:
* tools/Makefile.am:
* examples/Makefile.am: Remove use of the GTHREAD* variables..
* examples/network/resolver.cc: Remove the non-threading option and code that
uses it.
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d887868f..10bc1ac4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -44,7 +44,7 @@ glibmm_includes = -I$(top_builddir)/glib $(if $(srcdir:.=),-I$(top_srcdir)/glib) giomm_includes = -I$(top_builddir)/gio $(if $(srcdir:.=),-I$(top_srcdir)/gio) local_cppflags = -I$(top_builddir) $(glibmm_includes) $(giomm_includes) -AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GIOMM_CFLAGS) +AM_CPPFLAGS = $(local_cppflags) $(GIOMM_CFLAGS) AM_CXXFLAGS = $(GLIBMM_WXXFLAGS) local_libglibmm = $(top_builddir)/glib/glibmm/libglibmm-$(GLIBMM_API_VERSION).la |