aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog6
-rw-r--r--macros/gnome-libgtop-check.m414
2 files changed, 16 insertions, 4 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 0273f17e87..a36bdd07ba 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-09 Martin Baulig <martin@home-of-linux.org>
+
+ * gnome-libgtop-check.m4: Applied patch from R. Bernstein
+ <rocky@panix.com> - print a better error message when
+ LibGTop's major version number mismatches.
+
1999-12-25 Martin Baulig <martin@home-of-linux.org>
* gnome-pilot.m4: Applied patch from Colin Walters to make
diff --git a/macros/gnome-libgtop-check.m4 b/macros/gnome-libgtop-check.m4
index 95bb8e479a..ee67c3b107 100644
--- a/macros/gnome-libgtop-check.m4
+++ b/macros/gnome-libgtop-check.m4
@@ -116,10 +116,13 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK],
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
libgtop_micro_version=`$LIBGTOP_CONFIG --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- test $libgtop_major_version != $min_libgtop_major && no_libgtop=yes
- test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes
- if test $libgtop_minor_version = $min_libgtop_minor ; then
- test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes
+ if test $libgtop_major_version != $min_libgtop_major ; then
+ no_libgtop=mismatch
+ else
+ test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes
+ if test $libgtop_minor_version = $min_libgtop_minor ; then
+ test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes
+ fi
fi
. $configfile
fi
@@ -136,6 +139,9 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK],
ifelse([$2], [], :, [$2])
else
AC_MSG_RESULT(no)
+ if test "$no_libgtop"x = mismatchx; then
+ AC_MSG_ERROR(LibGTop major version mismatch $libgtop_major_version != $min_libgtop_major)
+ fi
if test "x$3" = "xfail"; then
AC_MSG_ERROR(LibGTop >= $min_libgtop_version not found)
else