diff options
author | Martin Baulig <baulig@suse.de> | 2000-06-13 15:09:48 +0000 |
---|---|---|
committer | Martin Baulig <martin@src.gnome.org> | 2000-06-13 15:09:48 +0000 |
commit | bb4c232c22a081160733d746aceb962ae4517677 (patch) | |
tree | b61c39fe486bd2f260ad44dbf50ec305e8b09a55 /macros | |
parent | 812ac2024a5131dff62d9bcfad9c6bd507e83d64 (diff) | |
download | gnome-common-bb4c232c22a081160733d746aceb962ae4517677.tar.gz |
New macro. Checks whether Bonobo uses OAF and defines `BONOBO_USES_OAF' if
2000-06-13 Martin Baulig <baulig@suse.de>
* gnome-bonobo-check.am (AM_BONOBO_USES_OAF): New macro.
Checks whether Bonobo uses OAF and defines `BONOBO_USES_OAF'
if appropriate. Also provides `BONOBO_USES_OAF' automake
conditional.
svn path=/trunk/; revision=1268
Diffstat (limited to 'macros')
-rw-r--r-- | macros/ChangeLog | 7 | ||||
-rw-r--r-- | macros/gnome-bonobo-check.m4 | 16 |
2 files changed, 23 insertions, 0 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 3336d6c..ac39413 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,5 +1,12 @@ 2000-06-13 Martin Baulig <baulig@suse.de> + * gnome-bonobo-check.am (AM_BONOBO_USES_OAF): New macro. + Checks whether Bonobo uses OAF and defines `BONOBO_USES_OAF' + if appropriate. Also provides `BONOBO_USES_OAF' automake + conditional. + +2000-06-13 Martin Baulig <baulig@suse.de> + * Makefile.am (EXTRA_DIST): Added `gnome-gettext.m4'. (gnome_aclocal_DATA): Added `gnome-gettext.m4'. diff --git a/macros/gnome-bonobo-check.m4 b/macros/gnome-bonobo-check.m4 index 7eb2b26..95949cc 100644 --- a/macros/gnome-bonobo-check.m4 +++ b/macros/gnome-bonobo-check.m4 @@ -148,3 +148,19 @@ 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") +]) |