diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 39 | ||||
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/Makefile.am | 12 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
5 files changed, 31 insertions, 39 deletions
@@ -1,3 +1,12 @@ +2000-06-25 Peter Williams <peterw@helixcode.com> + + * configure.in (pthread stuff): Make threads required due + to threaded evolution-mail. Subst in the THREADS_LIBS et + al. + + * tests/Makefile.am: Remove USE_THREADS conditional as we + always use threads now. + 2000-06-21 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Fixed some vertical scroll bugs. diff --git a/configure.in b/configure.in index 28dfd9fcf2..7af7493057 100644 --- a/configure.in +++ b/configure.in @@ -136,43 +136,26 @@ dnl ************************************************** dnl * Posix thread support dnl ************************************************** -have_pthread=false +dnl Hah! Threads are no longer an option +dnl AC_ARG_WITH(threads, [ --with-threads Include thread support],[ +dnl FIXME: support more thread types, pth at least -AC_ARG_WITH(threads, [ --with-threads Include thread support],[ - if test x$withval = xyes; then - test_thread=true - else - test_thread=false - fi -],[ - test_thread=false -]) +GNOME_PTHREAD_CHECK -if $test_thread; then - GNOME_PTHREAD_CHECK - if test "x$PTHREAD_LIB" = "x" ; then - have_pthread=false - else - have_pthread=true - fi -else - have_pthread=false +if test "x$PTHREAD_LIB" = "x" ; then + AC_MSG_ERROR([POSIX threads are currently required for Evolution]) fi -AM_CONDITIONAL(ENABLE_THREADS, $have_pthread) - dnl dnl Notice that this is a hack, and we wont be able to use this forever, but dnl at least for some time dnl -if $have_pthread; then - THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`" - THREADS_CFLAGS="`glib-config --cflags gthread`" -else - THREADS_LIBS="" - THREADS_CFLAGS="" -fi +THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`" +THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`" + +AC_SUBST(THREADS_LIBS) +AC_SUBST(THREADS_CFLAGS) dnl ************************************************** dnl * Print check diff --git a/mail/ChangeLog b/mail/ChangeLog index a2bddf1427..4baedbe444 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2000-06-25 Peter Williams <peterw@helixcode.com> + + * Makefile.am: Clean up the various _LIBS and _CFLAGS + to work with simpler THREADS_LIBS and THREADS_CFLAGS scheme. + 2000-06-23 Jeffrey Stedfast <fejj@helixcode.com> * folder-browser.c (folder_browser_load_folder): Improved the diff --git a/mail/Makefile.am b/mail/Makefile.am index e1c0bbbc97..992adfadac 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -20,7 +20,8 @@ INCLUDES = \ -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ - -DG_LOG_DOMAIN=\"evolution-mail\" + -DG_LOG_DOMAIN=\"evolution-mail\" \ + $(THREADS_CFLAGS) EVOLUTION_MAIL_CORBA_GENERATED = \ Mail.h \ @@ -69,8 +70,7 @@ evolution_mail_LDADD = \ $(top_builddir)/libibex/libibex.la \ $(top_builddir)/filter/libfilter.la \ $(BONOBO_HTML_GNOME_LIBS) \ - $(EXTRA_GNOME_LIBS) \ - $(PTHREAD_LIB) \ + $(THREADS_LIBS) \ $(UNICODE_LIBS) test_mail_SOURCES = \ @@ -85,10 +85,10 @@ test_thread_SOURCES = \ test-thread.c test_thread_LDADD = \ - $(BONOBO_VFS_GNOME_LIBS) \ - $(PTHREAD_LIB) + $(BONOBO_HTML_GNOME_LIBS) \ + $(THREADS_LIBS) -test_thread_CFLAGS = -g +test_thread_CFLAGS = -g $(THREADS_CFLAGS) GOAD_FILES = evolution-mail.gnorba OAF_FILES = evolution-mail.oafinfo diff --git a/tests/Makefile.am b/tests/Makefile.am index 8ce3cffb3d..a73eb21c55 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -55,12 +55,7 @@ test_movemail_LDADD = \ $(GNOME_LIBDIR) \ $(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS) -if ENABLE_THREADS THREAD_RELATED_TESTS=test8 -else -THREAD_RELATED_TESTS= -endif - noinst_PROGRAMS = \ test1 \ |