diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.in | 22 | ||||
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/folder-browser-factory.c | 7 |
5 files changed, 17 insertions, 25 deletions
@@ -1,3 +1,9 @@ +2000-08-05 Dan Winship <danw@helixcode.com> + + * configure.in, README: Update the README and the text of the + Bonobo configure check to match reality. Remove the 0.15 vs + 0.15-and-a-half check since we require post-0.16 now. + 2000-08-03 JP Rosevear <jpr@helixcode.com> * configure.in: Remove gconf check @@ -111,7 +111,7 @@ ftp.gnome.org. The (*)ed packages are available in Helix GNOME. *** You should use the flag "--disable-more-warnings" when *** configuring gnome-vfs, or it may fail to build. - - bonobo - 0.16 or later + - bonobo - from CVS *** Note that bonobo must be installed with the same --prefix as *** either gnome-libs or evolution for the Makefiles to work diff --git a/configure.in b/configure.in index 55f50c0746..0beb68b2c2 100644 --- a/configure.in +++ b/configure.in @@ -219,12 +219,12 @@ dnl AC_SUBST(GNOMEGNORBA_LIBS) dnl ****************************** dnl Check for Bonobo dnl ****************************** -AC_MSG_CHECKING(for Bonobo >= 0.15) +AC_MSG_CHECKING(for Bonobo > 0.16) if gnome-config --libs bonobox > /dev/null 2>&1; then vers=`gnome-config --modversion bonobo` case $vers in - bonobo-0.?|bonobo-0.1[0-4]) bonobo_ok=false ;; + bonobo-0.?|bonobo-0.1[0-5]) bonobo_ok=false ;; *) bonobo_ok=true ;; esac else @@ -234,25 +234,9 @@ fi if $bonobo_ok; then AC_MSG_RESULT($vers found) else - AC_MSG_ERROR(Bonobo 0.15 is required to compile Evolution) + AC_MSG_ERROR(Bonobo newer than 0.16 is required to compile Evolution) fi -dnl Check 0.15 vs post-0.15 -saved_CFLAGS="$CFLAGS" -saved_LDFLAGS="$LDFLAGS" -CFLAGS="$CFLAGS `gnome-config --cflags bonobox`" -LDFLAGS="$LDFLAGS `gnome-config --libs bonobox`" -AC_TRY_COMPILE([ -#include <bonobo/bonobo-ui-handler.h> -],[ -bonobo_ui_handler_menu_set_callback (NULL, NULL, NULL, NULL, NULL); -],bonobo_new=true,bonobo_new=false) - -if $bonobo_new; then - AC_DEFINE(BONOBO_POST_0_15) -fi - - dnl ****************************** dnl LibGlade checking dnl ****************************** diff --git a/mail/ChangeLog b/mail/ChangeLog index 215db24b7b..2bc98fcc11 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2000-08-05 Dan Winship <danw@helixcode.com> + + * folder-browser-factory.c (control_activate): Remove bonobo 0.15 + vs 0.15-and-a-half ifdef, since we require post-0.16 now. + 2000-08-04 Peter Williams <peterw@helixcode.com> * mail-ops.c (move_msg): Fixed a pretty silly uninitialization bug. diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 6a3123b9f9..bf13ce6319 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -63,11 +63,8 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, threaded_view); bonobo_ui_handler_menu_set_callback (uih, "/View/Threaded", message_list_toggle_threads, - FOLDER_BROWSER (folder_browser)->message_list -#ifdef BONOBO_POST_0_15 - , NULL -#endif - ); + FOLDER_BROWSER (folder_browser)->message_list, + NULL); bonobo_ui_handler_menu_new_item (uih, "/Actions/Mark all seen", _("_Mark all messages seen"), |