diff options
| author | Arturo Espinosa <unammx@src.gnome.org> | 1999-05-29 00:01:33 +0000 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1999-05-29 00:01:33 +0000 |
| commit | d8e2b86f9564b58d458f63eb8b1bf377b8b135ce (patch) | |
| tree | 9ee46a5ef674bdf62325cdb23bc745c6c14aab51 | |
| parent | b8c9ff5f39869bbeb7e2956a88d655050ac5edae (diff) | |
| download | gnome-common-gnome-pim-1-0.tar.gz | |
Merge improvements and bug fixes from HEAD.gnome-pim-1-0
Merge improvements and bug fixes from HEAD.
Prepare for 1.0.8 release.
Miguel.
svn path=/branches/gnome-pim-1-0/; revision=814
| -rw-r--r-- | macros/ChangeLog | 9 | ||||
| -rw-r--r-- | macros/Makefile.am | 1 | ||||
| -rw-r--r-- | macros/gnome-bonobo-check.m4 | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index afa6685..8f978eb 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,12 @@ +1999-05-11 Raja R Harinath <harinath@cs.umn.edu> + + * Makefile.am (MACROS): Add `gnome-bonobo-check.m4'. + +1999-05-09 Jacob Berkman <jberk+@cmu.edu> + + * gnome-bonobo-check.m4: made test program return 0, + changed BONOBO_CHECK to not return "failure" on success + 1999-04-16 Raja R Harinath <harinath@cs.umn.edu> * gnome-print-check.m4 (GNOME_PRINT_CHECK): Fix invocation of diff --git a/macros/Makefile.am b/macros/Makefile.am index a48df7f..e03dbee 100644 --- a/macros/Makefile.am +++ b/macros/Makefile.am @@ -3,6 +3,7 @@ MACROS= \ aclocal-include.m4 \ compiler-flags.m4 \ curses.m4 \ + gnome-bonobo-check.m4 \ gnome-fileutils.m4 \ gnome-gettext.m4 \ gnome-ghttp-check.m4 \ diff --git a/macros/gnome-bonobo-check.m4 b/macros/gnome-bonobo-check.m4 index fdac4d1..65e272c 100644 --- a/macros/gnome-bonobo-check.m4 +++ b/macros/gnome-bonobo-check.m4 @@ -89,6 +89,7 @@ int main () system ("touch conf.bonobotest"); gnome_object_get_type (); + return 0; } ],, no_bonobo=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) @@ -144,6 +145,6 @@ int main () ]) AC_DEFUN([BONOBO_CHECK], [ - AM_PATH_BONOBO(0.1.0,failure) + AM_PATH_BONOBO(0.1.0,,[AC_MSG_ERROR(BONOBO not found)]) ]) |