diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | acconfig.h | 1 | ||||
| -rw-r--r-- | configure.in | 21 |
3 files changed, 23 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2000-07-10 Dan Winship <danw@helixcode.com> + + * configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15 + 2000-07-09 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Don't draw quite as large a "flat_box". diff --git a/acconfig.h b/acconfig.h index ebc1605516..29a1e3de1c 100644 --- a/acconfig.h +++ b/acconfig.h @@ -17,6 +17,7 @@ #undef HAVE_KRB4 #undef HAVE_KRB5 #undef USE_BROKEN_THREADS +#undef BONOBO_POST_0_15 /* Define this if you want to build against the development gtk */ #undef HAVE_DEVGTK diff --git a/configure.in b/configure.in index 2529377f74..2e45957c6d 100644 --- a/configure.in +++ b/configure.in @@ -220,12 +220,12 @@ dnl AC_SUBST(GNOMEGNORBA_LIBS) dnl ****************************** dnl Check for Bonobo dnl ****************************** -AC_MSG_CHECKING(for Bonobo >= 0.10) +AC_MSG_CHECKING(for Bonobo >= 0.15) if gnome-config --libs bonobo > /dev/null 2>&1; then vers=`gnome-config --modversion bonobo` case $vers in - bonobo-0.?) bonobo_ok=false ;; + bonobo-0.?|bonobo-0.1[0-4]) bonobo_ok=false ;; *) bonobo_ok=true ;; esac else @@ -235,7 +235,22 @@ fi if $bonobo_ok; then AC_MSG_RESULT($vers found) else - AC_MSG_ERROR(Bonobo 0.10 is required to compile Evolution) + AC_MSG_ERROR(Bonobo 0.15 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 bonobo`" +LDFLAGS="$LDFLAGS `gnome-config --libs bonobo`" +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 |