diff options
| author | Martin Baulig <martin@home-of-linux.org> | 2000-01-09 09:59:30 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2000-01-09 09:59:30 +0000 |
| commit | 850d976288034078fe5ea807055784092ac9f988 (patch) | |
| tree | e49ae2103f3e4036e935eb2908c0af33122ebf96 | |
| parent | 67820167363386eddb0a858b89c053e57f0ba003 (diff) | |
| download | gnome-common-850d976288034078fe5ea807055784092ac9f988.tar.gz | |
Applied patch from R. Bernstein <rocky@panix.com> - print a better error
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.
svn path=/trunk/; revision=1054
| -rw-r--r-- | macros/ChangeLog | 6 | ||||
| -rw-r--r-- | macros/gnome-libgtop-check.m4 | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 0273f17..a36bdd0 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 95bb8e4..ee67c3b 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 |