From 784c1184a8d73c23f6462997da00e354297fdf78 Mon Sep 17 00:00:00 2001 From: bertrand Date: Fri, 11 Feb 2000 00:43:23 +0000 Subject: don't build thread related tests if evolution has been compiled with no 2000-02-10 bertrand * tests/Makefile.am (THREAD_RELATED_TESTS): don't build thread related tests if evolution has been compiled with no thread support. * configure.in (have_pthread): allow user to enable/disable thread support at configure time (EXTRA_GNOME_CFLAGS): (EXTRA_GNOME_LIBS): thread support is directly included in this variable if enabled. No more EXTRA_GNOME_CFLAGS_THREADS Other special support should be added in EXTRA_GNOME_LIBS and EXTRA_GNOME_CFLAGS instead of redefining a new variable each time we want to add a new lib. (bonobo, ....) * camel/camel.c (camel_init): only try to initialize threads if we enabled threads support. * tests/ui-tests/Makefile.am (message_browser_LDADD): use EXTRA_GNOME_LIBS * configure.in (have_pthread): remove HAVE_PTHREADS variable. Define ENABLE_THREADS instead. * camel/Makefile.am: use ENABLE_THREADS not HAVE_PTHREADS to test if we build thread relateed code. * tests/Makefile.am: use EXTRA_GNOME_LIBS, not EXTRA_GNOME_LIBS_THREADS I need to be able to disable thread support to use Insure. svn path=/trunk/; revision=1725 --- camel/Makefile.am | 2 +- camel/camel.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'camel') diff --git a/camel/Makefile.am b/camel/Makefile.am index 2003a951e6..2db0ecf42c 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -12,7 +12,7 @@ INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \ $(GTK_INCLUDEDIR) -if HAVE_PTHREAD +if ENABLE_THREADS pthread_SRC = \ camel-folder-pt-proxy.c \ diff --git a/camel/camel.c b/camel/camel.c index 2bb3dc163f..febdb2d2bb 100644 --- a/camel/camel.c +++ b/camel/camel.c @@ -29,11 +29,15 @@ gint camel_init() { + + +#ifdef ENABLE_THREADS #ifdef G_THREADS_ENABLED g_thread_init (NULL); #else /* G_THREADS_ENABLED */ printf ("Threads are not supported by your version of glib\n"); #endif /* G_THREADS_ENABLED */ +#endif /* ENABLE_THREADS */ return data_wrapper_repository_init (); } -- cgit v1.2.3