aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog7
-rw-r--r--macros/gnome.m42
2 files changed, 8 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 4d87d78530..c7f0348d80 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,10 @@
+1998-11-20 James Henstridge <james@daa.com.au>
+
+ * gnome.m4(GNOME_INIT_HOOK): Changed the call to GNOME_GNORBA_CHECK
+ to GNOME_GNORBA_HOOK([],$2). Before if you specified that the
+ macro should not exit on errors, and you didn't have ORBit, the
+ script would fail anyway.
+
1998-11-17 Martin Baulig <martin@home-of-linux.org>
* gnome-libgtop-sysdeps.m4: We need to check for <net/if_var.h>
diff --git a/macros/gnome.m4 b/macros/gnome.m4
index 6c9f90d8e1..4575a2419d 100644
--- a/macros/gnome.m4
+++ b/macros/gnome.m4
@@ -21,7 +21,7 @@ AC_DEFUN([GNOME_INIT_HOOK],
AC_MSG_CHECKING(if $GNOME_CONFIG works)
if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
AC_MSG_RESULT(yes)
- GNOME_GNORBA_CHECK
+ GNOME_GNORBA_HOOK([],$2)
GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"