aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog5
-rw-r--r--macros/gnome-orbit-check.m49
2 files changed, 10 insertions, 4 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 7832e788c6..390b5c6793 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,8 @@
+1998-10-20 Andrew Veliath <andrewtv@usa.net>
+
+ * gnome-orbit-check.m4 (GNOME_ORBIT_HOOK): Add ORBIT_IDL
+ detection; fix failure flag.
+
1998-10-12 Martin Baulig <martin@home-of-linux.org>
* compiler-flags.m4 (warnCFLAGS): Added `-Wno-unused'.
diff --git a/macros/gnome-orbit-check.m4 b/macros/gnome-orbit-check.m4
index 95f4eaa8e5..71faacdbae 100644
--- a/macros/gnome-orbit-check.m4
+++ b/macros/gnome-orbit-check.m4
@@ -1,14 +1,15 @@
dnl
-dnl GNOME_ORBIT_HOOK (script-if-orbit-found, failflat)
+dnl GNOME_ORBIT_HOOK (script-if-orbit-found, failflag)
dnl
dnl if failflag is "failure" it aborts if orbit is not found.
dnl
AC_DEFUN([GNOME_ORBIT_HOOK],[
AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no)
- if test x$ORBIT_CONFIG = xno; then
- if test x$2 = failure; then
- AC_MSG_ERROR(Could not find orbit-config)
+ AC_PATH_PROG(ORBIT_IDL,orbit-idl,no)
+ if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then
+ if test x$2 = xfailure; then
+ AC_MSG_ERROR(Could not find orbit-config or orbit-idl)
fi
else
$1