callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a check for Bonobo 0.15 vs Bonobo post-0.15

Browse Source 
* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15

svn path=/trunk/; revision=4053
This commit is contained in:
Dan Winship
2000-07-10 21:22:47 +00:00
parent ba8853311f
commit 2fc2feb62e
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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".

1
acconfig.h
View File

@ -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

21
configure.in
View File

@ -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