From 784c1184a8d73c23f6462997da00e354297fdf78 Mon Sep 17 00:00:00 2001
From: bertrand <Bertrand.Guiheneuf@aful.org>
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  <Bertrand.Guiheneuf@aful.org>

	* 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
---
 tests/Makefile.am          | 14 ++++++++++----
 tests/ui-tests/Makefile.am | 11 +++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7f5873ea53..441837288d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \
 LDADD = \
 	$(top_builddir)/camel/libcamel.la 	\
 	$(GNOME_LIBDIR) 			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(PTHREAD_LIB) $(EXTRA_GNOME_LIBS_THREADS)
+	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
 #	$(BONOBO_LIBS)				
 
 
@@ -22,7 +22,13 @@ test9_LDADD = \
 	$(top_builddir)/camel/libcamel.la 	\
 	$(top_builddir)/camel/providers/mbox/libcamelmbox.la 	\
 	$(GNOME_LIBDIR) 			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(PTHREAD_LIB) $(EXTRA_GNOME_LIBS_THREADS)
+	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
+
+if ENABLE_THREADS
+THREAD_RELATED_TESTS=test8
+else
+THREAD_RELATED_TESTS=
+endif
 
 
 noinst_PROGRAMS =  	\
@@ -30,7 +36,7 @@ noinst_PROGRAMS =  	\
 	test2		\
 	test3		\
 	test7		\
-	test8		\
 	test9		\
 	test10		\
-	test-formatter	
+	test-formatter	\
+	$(THREAD_RELATED_TESTS)
diff --git a/tests/ui-tests/Makefile.am b/tests/ui-tests/Makefile.am
index 34c05f3115..b81b0e8f0d 100644
--- a/tests/ui-tests/Makefile.am
+++ b/tests/ui-tests/Makefile.am
@@ -20,7 +20,14 @@ message_browser_LDADD = \
 	$(INTLLIBS)					\
 	$(EXTRA_GNOME_LIBS)				\
 	$(PTHREAD_LIB) 					\
-	$(EXTRA_GNOME_LIBS_THREADS)
+	$(EXTRA_GNOME_LIBS)
+
+camelfilter_LDADD = \
+	$(top_builddir)/camel/libcamel.la		\
+	$(INTLLIBS)					\
+	$(EXTRA_GNOME_LIBS)				\
+	$(PTHREAD_LIB) 					\
+	$(EXTRA_GNOME_LIBS)
 
 noinst_PROGRAMS =  	\
-	message-browser	
+	message-browser	camelfilter
-- 
cgit v1.2.3