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

1 files changed, 24 insertions, 8 deletions

diff --git a/configure.in b/configure.in
index c76f3fd07d..3606f7c29a 100644
--- a/configure.in
+++ b/configure.in
@@ -42,17 +42,25 @@ AM_GNOME_GETTEXT
 
 GNOME_X_CHECKS
 
+
+
 dnl **************************************************
 dnl * Posix thread support
 dnl **************************************************
-GNOME_PTHREAD_CHECK
+
+have_pthread=false
+
+AC_ARG_WITH(threads, [--with-threads inculde threads support],
+            [GNOME_PTHREAD_CHECK])
+
 if test "x$PTHREAD_LIB" = "x" ; then
    have_pthread=false
 else
    have_pthread=true
 fi
 
-AM_CONDITIONAL(HAVE_PTHREAD, $have_pthread)
+AM_CONDITIONAL(ENABLE_THREADS, $have_pthread)
+
 
 dnl **************************************************
 dnl * Print check
@@ -108,11 +116,22 @@ else
     AC_MSG_ERROR(Did not find gdkpixbuf installed)
 fi
 
-EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui libglade gdk_pixbuf gnomecanvaspixbuf `"
-EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui libglade gdk_pixbuf gnomecanvaspixbuf `"
+if $have_pthread; then 
+ 	THREADS_LIBS="$(PTHREAD_LIB) `glib-config --libs gthread`"
+	THREADS_CFLAGS="`glib-config --cflags gthread`"
+else
+	THREADS_LIBS=""
+	THREADS_CFLAGS=""
+fi
+
+EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui libglade gdk_pixbuf gnomecanvaspixbuf ` $THREADS_LIBS"
+EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui libglade gdk_pixbuf gnomecanvaspixbuf ` $THREADS_CFLAGS"
+
+
 AC_SUBST(EXTRA_GNOME_LIBS)
 AC_SUBST(EXTRA_GNOME_CFLAGS)
 
+
 BONOBO_GNOME_LIBS="`gnome-config --libs gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf `"
 BONOBO_GNOME_CFLAGS="`gnome-config --cflags gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf `"
 AC_SUBST(BONOBO_GNOME_LIBS)
@@ -123,10 +142,7 @@ BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags gnomeui bonobo libglade gdk_pix
 AC_SUBST(BONOBO_HTML_GNOME_LIBS)
 AC_SUBST(BONOBO_HTML_GNOME_CFLAGS)
 
-EXTRA_GNOME_LIBS_THREADS="`gnome-config --libs gnomeui libglade gdk_pixbuf gnomecanvaspixbuf ` `glib-config --libs gthread`"
-EXTRA_GNOME_CFLAGS_THREADS="`gnome-config --cflags gnomeui libglade gdk_pixbuf gnomecanvaspixbuf ` `glib-config --cflags gthread`"
-AC_SUBST(EXTRA_GNOME_LIBS_THREADS)
-AC_SUBST(EXTRA_GNOME_CFLAGS_THREADS)
+
 
 BONOBO_VFS_GNOME_LIBS="`gnome-config --libs gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs `"
 BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags gnomeui bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs `"