From a8ccf540137ec5fa18a00a0a8f4819ab43806a30 Mon Sep 17 00:00:00 2001 From: bertrand Date: Tue, 21 Sep 1999 20:40:27 +0000 Subject: Check pthreads. 1999-09-21 bertrand * configure.in: Check pthreads. * camel/Makefile.am: camel-folder-pt-proxy.c is only compiled when pthreads are available. svn path=/trunk/; revision=1247 --- ChangeLog | 7 +++++++ camel/Makefile.am | 25 +++++++++++++++++++++---- camel/camel-folder-pt-proxy.c | 10 +++++----- configure.in | 13 +++++++++++++ tests/Makefile.am | 7 +++---- tests/ui-tests/Makefile.am | 2 +- 6 files changed, 50 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b62b80221..2ee86eacbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 1999-09-21 bertrand + * configure.in: + Check pthreads. + + * camel/Makefile.am: + camel-folder-pt-proxy.c is only compiled + when pthreads are available. + * camel/camel-folder-pt-proxy.c: Signal proxying implemenatation. (_signal_marshaller_server_side): diff --git a/camel/Makefile.am b/camel/Makefile.am index 322f096e76..ef3d19c44d 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -11,13 +11,29 @@ INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \ -I$(top_srcdir)/intl \ $(GTK_INCLUDEDIR) + +if HAVE_PTHREAD + +libcamel_pthread_SOURCES = \ + camel-folder-pt-proxy.c + +libcamel_pthread_HEADERS = \ + camel-folder-pt-proxy.h + +else + +libcamel_pthread_SOURCES = +libcamel_pthread_HEADERS = + +endif + + libcamel_la_SOURCES = \ camel.c \ camel-log.c \ camel-data-wrapper.c \ camel-simple-data-wrapper.c \ camel-folder.c \ - camel-folder-pt-proxy.c \ camel-folder-summary.c \ camel-medium.c \ camel-mime-body-part.c \ @@ -42,7 +58,8 @@ libcamel_la_SOURCES = \ hash-table-utils.c \ md5-utils.c \ string-utils.c \ - url-util.c + url-util.c \ + $(libcamel_pthread_SOURCES) libcamelinclude_HEADERS = \ camel.h \ @@ -50,7 +67,6 @@ libcamelinclude_HEADERS = \ camel-data-wrapper.h \ camel-simple-data-wrapper.h \ camel-folder.h \ - camel-folder-pt-proxy.h \ camel-folder-summary.h \ camel-mime-body-part.h \ camel-medium.h \ @@ -75,7 +91,8 @@ libcamelinclude_HEADERS = \ hash-table-utils.h \ md5-utils.h \ string-utils.h \ - url-util.h + url-util.h \ + $(libcamel_pthread_HEADERS) libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) diff --git a/camel/camel-folder-pt-proxy.c b/camel/camel-folder-pt-proxy.c index 6aa5340000..289c02ddcf 100644 --- a/camel/camel-folder-pt-proxy.c +++ b/camel/camel-folder-pt-proxy.c @@ -80,7 +80,7 @@ static gboolean _thread_notification_catch (GIOChannel *source, gpointer data); static void -camel_folder_proxy_class_init (CamelFolderPtProxyClass *camel_folder_pt_proxy_class) +camel_folder_pt_proxy_class_init (CamelFolderPtProxyClass *camel_folder_pt_proxy_class) { GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (camel_folder_pt_proxy_class); CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_folder_pt_proxy_class); @@ -123,7 +123,7 @@ camel_folder_proxy_class_init (CamelFolderPtProxyClass *camel_folder_pt_proxy_cl static void -camel_folder_proxy_init (CamelFolderPtProxy *folder_pt_proxy) +camel_folder_pt_proxy_init (CamelFolderPtProxy *folder_pt_proxy) { folder_pt_proxy->op_queue = camel_op_queue_new (); folder_pt_proxy->signal_data_cond = g_cond_new(); @@ -133,7 +133,7 @@ camel_folder_proxy_init (CamelFolderPtProxy *folder_pt_proxy) GtkType -camel_folder_proxy_get_type (void) +camel_folder_pt_proxy_get_type (void) { static GtkType camel_folder_pt_proxy_type = 0; @@ -143,8 +143,8 @@ camel_folder_proxy_get_type (void) "CamelFolderPtProxy", sizeof (CamelFolderPtProxy), sizeof (CamelFolderPtProxyClass), - (GtkClassInitFunc) camel_folder_proxy_class_init, - (GtkObjectInitFunc) camel_folder_proxy_init, + (GtkClassInitFunc) camel_folder_pt_proxy_class_init, + (GtkObjectInitFunc) camel_folder_pt_proxy_init, /* reserved_1 */ NULL, /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, diff --git a/configure.in b/configure.in index a7de8ace46..1cc9ce6394 100644 --- a/configure.in +++ b/configure.in @@ -40,6 +40,19 @@ AM_GNOME_GETTEXT GNOME_X_CHECKS +dnl ************************************************** +dnl * Posix thread support +dnl ************************************************** +GNOME_PTHREAD_CHECK +if test "x$PTHREAD_LIB" = "x" ; then + have_pthread=false +else + have_pthread=true +fi + +AM_CONDITIONAL(HAVE_PTHREAD, $have_pthread) + + dnl ************************************************** dnl * ORBit support dnl ************************************************** diff --git a/tests/Makefile.am b/tests/Makefile.am index 94657fef63..e781124e3b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/camel \ LDADD = \ $(top_builddir)/camel/libcamel.la \ $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) $(INTLLIBS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(PTHREAD_LIB) # $(BONOBO_LIBS) @@ -15,7 +15,7 @@ test4_LDADD = \ $(top_builddir)/camel/libcamel.la \ $(top_builddir)/camel/providers/MH/libcamelmh.la \ $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) $(INTLLIBS) + $(GNOMEUI_LIBS) $(INTLLIBS) $(PTHREAD_LIB) noinst_PROGRAMS = \ @@ -23,5 +23,4 @@ noinst_PROGRAMS = \ test2 \ test3 \ test4 \ - test7 \ - test8 + test7 diff --git a/tests/ui-tests/Makefile.am b/tests/ui-tests/Makefile.am index 8ed5393e8a..c4849e7c3c 100644 --- a/tests/ui-tests/Makefile.am +++ b/tests/ui-tests/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/camel \ LDADD = \ $(top_builddir)/camel/libcamel.la \ $(top_builddir)/camel/providers/MH/libcamelmh.la \ - $(INTLLIBS) $(EXTRA_GNOME_LIBS) + $(INTLLIBS) $(EXTRA_GNOME_LIBS) $(PTHREAD_LIB) -- cgit v1.2.3