diff options
Diffstat (limited to 'macros/gnome-bonobo-check.m4')
| -rw-r--r-- | macros/gnome-bonobo-check.m4 | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/macros/gnome-bonobo-check.m4 b/macros/gnome-bonobo-check.m4 index daa109c0..65e272cf 100644 --- a/macros/gnome-bonobo-check.m4 +++ b/macros/gnome-bonobo-check.m4 @@ -41,8 +41,8 @@ AC_ARG_ENABLE(bonobotest, [ --disable-bonobotest Do not try to compile an if test "$GNOME_CONFIG" = "no" ; then no_bonobo=yes else - BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo bonobox` - BONOBO_LIBS=`$GNOME_CONFIG $bonoboconf_args --libs bonobo bonobox` + BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo` + BONOBO_LIBS=`$GNOME_CONFIG $bonoboconf_args --libs bonobo` bonobo_major_version=`$GNOME_CONFIG $bonobo_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` @@ -64,7 +64,7 @@ dnl #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <bonobo.h> +#include <bonobo/gnome-object.h> static char* my_strdup (char *str) @@ -88,7 +88,7 @@ int main () char *tmp_version; system ("touch conf.bonobotest"); - bonobo_object_get_type (); + gnome_object_get_type (); return 0; } @@ -148,19 +148,3 @@ AC_DEFUN([BONOBO_CHECK], [ AM_PATH_BONOBO(0.1.0,,[AC_MSG_ERROR(BONOBO not found)]) ]) -AC_DEFUN([AM_BONOBO_USES_OAF], -[ - AC_REQUIRE([AM_PATH_BONOBO]) - - AC_MSG_CHECKING(if Bonobo uses OAF) - if ( gnome-config --libs bonobo | grep oaf ) > /dev/null 2>&1 ; then - using_oaf="yes" - AC_DEFINE(BONOBO_USES_OAF) - else - using_oaf="no" - fi - - AC_MSG_RESULT("$using_oaf") - - AM_CONDITIONAL(BONOBO_USES_OAF, test x"using_oaf" = "xyes") -]) |