aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/ChangeLog7
-rw-r--r--macros/gnome-libgtop-check.m413
2 files changed, 17 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 5cdeb0ca38..dd31b0fe4a 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,10 @@
+1998-08-23 Martin Baulig <martin@home-of-linux.org>
+
+ * gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): You can give
+ this macro two parameters: the required version number and
+ an optional `fail' argument to make it fail if LibGTop is
+ not found.
+
1998-08-22 Martin Baulig <martin@home-of-linux.org>
* gnome-guile-checks.m4: Added check for `-lnsl' and `-lsocket'
diff --git a/macros/gnome-libgtop-check.m4 b/macros/gnome-libgtop-check.m4
index 25a7bf924e..fc8fe80cae 100644
--- a/macros/gnome-libgtop-check.m4
+++ b/macros/gnome-libgtop-check.m4
@@ -11,9 +11,9 @@ AC_DEFUN([GNOME_LIBGTOP_TYPES],
])
dnl
-dnl GNOME_LIBGTOP_HOOK (script-if-libgtop-enabled, failflag)
+dnl GNOME_LIBGTOP_HOOK (minversion, script-if-libgtop-enabled, failflag)
dnl
-dnl if failflag is "fail" then GNOME_LIBGTOP_HOOK will abort if gtopConf.sh
+dnl if failflag is "fail" then GNOME_LIBGTOP_HOOK will abort if LibGTop
dnl is not found.
dnl
@@ -75,13 +75,20 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK],
if test x$no_libgtop = x ; then
AC_DEFINE(HAVE_LIBGTOP)
AC_MSG_RESULT(yes)
+ dnl Note that an empty true branch is not valid sh syntax.
+ ifelse([$2], [], :, [$2])
else
AC_MSG_RESULT(no)
+ if test "x$3" = "xfail"; then
+ AC_MSG_ERROR(LibGTop >= $min_libgtop_version not found)
+ else
+ AC_MSG_ERROR(LibGTop >= $min_libgtop_version not found)
+ fi
fi
AM_CONDITIONAL(HAVE_LIBGTOP, test x$no_libgtop != xyes)
])
AC_DEFUN([GNOME_INIT_LIBGTOP],[
- GNOME_LIBGTOP_HOOK([],)
+ GNOME_LIBGTOP_HOOK($1,[],$2)
])